diff --git a/ChangeLog.md b/ChangeLog.md index ffeb97b81b3..b0fa72746da 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -19,6 +19,7 @@ - Make `--version-tolerant` generated code mypy compatible in the `azure-sdk-for-python` repo. Tested only with the `--black` flag #1185 - Remove unnecessary vendored code in the `_vendor` file if the SDK has no operations #1196 - Fix the generation of the root `__init__` files for packages with only models #1195 +- Add pylint and mypy support for `--version-tolerant` generations with `--models-mode=msrest` #1202 ### 2022-03-08 - 5.14.0 diff --git a/autorest/codegen/models/base_schema.py b/autorest/codegen/models/base_schema.py index a6668f2a3a3..e42cc3f9787 100644 --- a/autorest/codegen/models/base_schema.py +++ b/autorest/codegen/models/base_schema.py @@ -90,8 +90,8 @@ def docstring_type(self) -> str: """ ... - @property - def type_annotation(self) -> str: + @abstractmethod + def type_annotation(self, *, is_operation_file: bool = False) -> str: """The python type used for type annotation Special case for enum, for instance: Union[str, "EnumName"] diff --git a/autorest/codegen/models/constant_schema.py b/autorest/codegen/models/constant_schema.py index 44f56ff84c9..611bacd3036 100644 --- a/autorest/codegen/models/constant_schema.py +++ b/autorest/codegen/models/constant_schema.py @@ -60,9 +60,8 @@ def docstring_type(self) -> str: """ return self.schema.docstring_type - @property - def type_annotation(self) -> str: - return self.schema.type_annotation + def type_annotation(self, *, is_operation_file: bool = False) -> str: + return self.schema.type_annotation(is_operation_file=is_operation_file) @classmethod def from_yaml(cls, namespace: str, yaml_data: Dict[str, Any], **kwargs) -> "ConstantSchema": diff --git a/autorest/codegen/models/credential_schema.py b/autorest/codegen/models/credential_schema.py index 66630a12b5f..4f5baf478ad 100644 --- a/autorest/codegen/models/credential_schema.py +++ b/autorest/codegen/models/credential_schema.py @@ -11,6 +11,9 @@ class CredentialSchema(BaseSchema): def __init__(self) -> None: # pylint: disable=super-init-not-called self.default_value = None + def type_annotation(self, *, is_operation_file: bool = False) -> str: + raise ValueError("Children classes should set their own type annotation") + @property def docstring_type(self) -> str: return self.serialization_type @@ -38,8 +41,7 @@ class AzureKeyCredentialSchema(CredentialSchema): def serialization_type(self) -> str: return "~azure.core.credentials.AzureKeyCredential" - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "AzureKeyCredential" def imports(self) -> FileImport: @@ -66,8 +68,7 @@ def serialization_type(self) -> str: return self.async_type return self.sync_type - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument if self.async_mode: return '"AsyncTokenCredential"' return '"TokenCredential"' diff --git a/autorest/codegen/models/dictionary_schema.py b/autorest/codegen/models/dictionary_schema.py index e6634ca34cb..88b0220d4be 100644 --- a/autorest/codegen/models/dictionary_schema.py +++ b/autorest/codegen/models/dictionary_schema.py @@ -34,14 +34,13 @@ def serialization_type(self) -> str: """ return f"{{{self.element_type.serialization_type}}}" - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: """The python type used for type annotation :return: The type annotation for this schema :rtype: str """ - return f"Dict[str, {self.element_type.type_annotation}]" + return f"Dict[str, {self.element_type.type_annotation(is_operation_file=is_operation_file)}]" @property def docstring_text(self) -> str: diff --git a/autorest/codegen/models/enum_schema.py b/autorest/codegen/models/enum_schema.py index 792ff39664d..c72b514d25b 100644 --- a/autorest/codegen/models/enum_schema.py +++ b/autorest/codegen/models/enum_schema.py @@ -80,14 +80,13 @@ def serialization_type(self) -> str: """ return self.enum_type.serialization_type - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: """The python type used for type annotation :return: The type annotation for this schema :rtype: str """ - return f'Union[{self.enum_type.type_annotation}, "_models.{self.name}"]' + return f'Union[{self.enum_type.type_annotation(is_operation_file=is_operation_file)}, "_models.{self.name}"]' def get_declaration(self, value: Any) -> str: return self.enum_type.get_declaration(value) @@ -100,7 +99,7 @@ def docstring_text(self) -> str: def docstring_type(self) -> str: """The python type used for RST syntax input and type annotation. """ - return f"{self.enum_type.type_annotation} or ~{self.namespace}.models.{self.name}" + return f"{self.enum_type.type_annotation()} or ~{self.namespace}.models.{self.name}" @staticmethod def _get_enum_values(yaml_data: List[Dict[str, Any]]) -> List["EnumValue"]: @@ -173,12 +172,6 @@ def imports(self) -> FileImport: file_import.merge(self.enum_type.imports()) return file_import - def model_file_imports(self) -> FileImport: - imports = self.imports() - # we import every enum since we can get extremely long imports - # if we import my name - imports.add_submodule_import("." + self.enum_file_name, "*", ImportType.LOCAL) - return imports class HiddenModelEnumSchema(EnumSchema): @@ -187,18 +180,17 @@ def imports(self) -> FileImport: file_import.merge(self.enum_type.imports()) return file_import - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: """The python type used for type annotation :return: The type annotation for this schema :rtype: str """ - return self.enum_type.type_annotation + return self.enum_type.type_annotation(is_operation_file=is_operation_file) @property def docstring_text(self) -> str: - return f"{self.enum_type.type_annotation}. {self.extra_description_information}" + return f"{self.enum_type.type_annotation()}. {self.extra_description_information}" @property def extra_description_information(self): @@ -220,7 +212,7 @@ def extra_description_information(self): def docstring_type(self) -> str: """The python type used for RST syntax input and type annotation. """ - return self.enum_type.type_annotation + return self.enum_type.type_annotation() def get_enum_schema(code_model) -> Type[EnumSchema]: if code_model.options["models_mode"]: diff --git a/autorest/codegen/models/list_schema.py b/autorest/codegen/models/list_schema.py index 37c4a5ed1dd..e1dded8758f 100644 --- a/autorest/codegen/models/list_schema.py +++ b/autorest/codegen/models/list_schema.py @@ -29,12 +29,11 @@ def __init__( def serialization_type(self) -> str: return f"[{self.element_type.serialization_type}]" - @property - def type_annotation(self) -> str: - if self.element_type.type_annotation == "ET.Element": + def type_annotation(self, *, is_operation_file: bool = False) -> str: + if self.element_type.type_annotation() == "ET.Element": # this means we're version tolerant XML, we just return the XML element - return self.element_type.type_annotation - return f"List[{self.element_type.type_annotation}]" + return self.element_type.type_annotation(is_operation_file=is_operation_file) + return f"List[{self.element_type.type_annotation(is_operation_file=is_operation_file)}]" @property def docstring_type(self) -> str: @@ -113,7 +112,7 @@ def from_yaml(cls, namespace: str, yaml_data: Dict[str, Any], **kwargs) -> "List def imports(self) -> FileImport: file_import = FileImport() - if not self.element_type.type_annotation == "ET.Element": + if not self.element_type.type_annotation(is_operation_file=True) == "ET.Element": file_import.add_submodule_import("typing", "List", ImportType.STDLIB, TypingSection.CONDITIONAL) file_import.merge(self.element_type.imports()) return file_import diff --git a/autorest/codegen/models/object_schema.py b/autorest/codegen/models/object_schema.py index cdcb3353e7e..7d7822d7dd5 100644 --- a/autorest/codegen/models/object_schema.py +++ b/autorest/codegen/models/object_schema.py @@ -39,9 +39,9 @@ def __init__( def serialization_type(self) -> str: return self.name - @property - def type_annotation(self) -> str: - return f'"_models.{self.name}"' + def type_annotation(self, *, is_operation_file: bool = False) -> str: + retval = f"_models.{self.name}" + return retval if is_operation_file else f'"{retval}"' @property def docstring_type(self) -> str: @@ -223,8 +223,7 @@ class HiddenModelObjectSchema(ObjectSchema): def serialization_type(self) -> str: return "object" - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument if self.xml_metadata: return "ET.Element" return "JSONType" diff --git a/autorest/codegen/models/operation.py b/autorest/codegen/models/operation.py index 22ce66928ba..b020b01daa8 100644 --- a/autorest/codegen/models/operation.py +++ b/autorest/codegen/models/operation.py @@ -159,7 +159,7 @@ def _imports_shared(self, async_mode: bool) -> FileImport: # pylint: disable=unu if response.has_body: file_import.merge(cast(BaseSchema, response.schema).imports()) - response_types = [r.type_annotation for r in self.responses if r.has_body] + response_types = [r.type_annotation(is_operation_file=True) for r in self.responses if r.has_body] if len(set(response_types)) > 1: file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL) @@ -273,7 +273,7 @@ def link_body_kwargs_to_body_params(self) -> None: def convert_multiple_content_type_parameters(self) -> None: type_annot = ", ".join([ - param.schema.type_annotation + param.schema.type_annotation(is_operation_file=True) for param in self.multiple_content_type_parameters ]) docstring_type = " or ".join([ diff --git a/autorest/codegen/models/operation_group.py b/autorest/codegen/models/operation_group.py index 54abe97720b..5e8b98c7c22 100644 --- a/autorest/codegen/models/operation_group.py +++ b/autorest/codegen/models/operation_group.py @@ -54,6 +54,7 @@ def imports_for_multiapi(self, async_mode: bool) -> FileImport: file_import = FileImport() for operation in self.operations: file_import.merge(operation.imports_for_multiapi(async_mode)) + file_import.add_submodule_import(".." if async_mode else ".", "models", ImportType.LOCAL, alias="_models") return file_import def imports(self, async_mode: bool) -> FileImport: diff --git a/autorest/codegen/models/parameter.py b/autorest/codegen/models/parameter.py index 259fa554bb7..789826140e3 100644 --- a/autorest/codegen/models/parameter.py +++ b/autorest/codegen/models/parameter.py @@ -225,7 +225,7 @@ def _is_io_json(self): ) and isinstance(self.schema, IOSchema) def _default_value(self) -> Tuple[Optional[Any], str, str]: - type_annot = self.multiple_content_types_type_annot or self.schema.type_annotation + type_annot = self.multiple_content_types_type_annot or self.schema.type_annotation(is_operation_file=True) if self._is_io_json: type_annot = f"Union[{type_annot}, JSONType]" any_types = ["Any", "JSONType"] @@ -277,8 +277,7 @@ def default_value(self) -> Optional[Any]: def default_value_declaration(self) -> Optional[Any]: return self._default_value()[1] - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return self._default_value()[2] @property @@ -297,13 +296,14 @@ def has_default_value(self): return self.default_value is not None or not self.required def method_signature(self, is_python3_file: bool) -> str: + type_annot = self.type_annotation(is_operation_file=True) if is_python3_file: if self.has_default_value: - return f"{self.serialized_name}: {self.type_annotation} = {self.default_value_declaration}," - return f"{self.serialized_name}: {self.type_annotation}," + return f"{self.serialized_name}: {type_annot} = {self.default_value_declaration}," + return f"{self.serialized_name}: {type_annot}," if self.has_default_value: - return f"{self.serialized_name}={self.default_value_declaration}, # type: {self.type_annotation}" - return f"{self.serialized_name}, # type: {self.type_annotation}" + return f"{self.serialized_name}={self.default_value_declaration}, # type: {type_annot}" + return f"{self.serialized_name}, # type: {type_annot}" @property def full_serialized_name(self) -> str: diff --git a/autorest/codegen/models/primitive_schemas.py b/autorest/codegen/models/primitive_schemas.py index 8b79b0707a9..a41b82c614a 100644 --- a/autorest/codegen/models/primitive_schemas.py +++ b/autorest/codegen/models/primitive_schemas.py @@ -39,8 +39,7 @@ def serialization_type(self) -> str: def docstring_type(self) -> str: return self._to_python_type() - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return self.docstring_type @property @@ -102,8 +101,7 @@ def serialization_type(self) -> str: def docstring_type(self) -> str: return self.type - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return self.docstring_type @property @@ -128,8 +126,7 @@ def serialization_type(self) -> str: def docstring_type(self) -> str: return "any" - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "Any" @property @@ -147,8 +144,7 @@ class JSONSchema(AnySchema): def docstring_type(self) -> str: return "JSONType" - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "JSONType" @@ -206,8 +202,7 @@ def docstring_type(self) -> str: return "int" return "float" - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument python_type = self.docstring_type if python_type == "long": return "int" @@ -269,10 +264,9 @@ def serialization_type(self) -> str: @property def docstring_type(self) -> str: - return "~" + self.type_annotation + return "~" + self.type_annotation() - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "datetime.datetime" @property @@ -301,10 +295,9 @@ def serialization_type(self) -> str: @property def docstring_type(self) -> str: - return "~" + self.type_annotation + return "~" + self.type_annotation() - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "datetime.time" @property @@ -334,10 +327,9 @@ def serialization_type(self) -> str: @property def docstring_type(self) -> str: - return "~" + self.type_annotation + return "~" + self.type_annotation() - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "datetime.datetime" @property @@ -367,10 +359,9 @@ def serialization_type(self) -> str: @property def docstring_type(self) -> str: - return "~" + self.type_annotation + return "~" + self.type_annotation() - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "datetime.date" @property @@ -400,10 +391,9 @@ def serialization_type(self) -> str: @property def docstring_type(self) -> str: - return "~" + self.type_annotation + return "~" + self.type_annotation() - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: # pylint: disable=unused-argument return "datetime.timedelta" @property diff --git a/autorest/codegen/models/property.py b/autorest/codegen/models/property.py index bfe86a9e1cc..6cfe2ca42dd 100644 --- a/autorest/codegen/models/property.py +++ b/autorest/codegen/models/property.py @@ -149,11 +149,10 @@ def default_value_declaration(self) -> Any: return self.schema.get_declaration(self.client_default_value) return self.schema.default_value_declaration - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: if self.required: - return self.schema.type_annotation - return f"Optional[{self.schema.type_annotation}]" + return self.schema.type_annotation(is_operation_file=is_operation_file) + return f"Optional[{self.schema.type_annotation(is_operation_file=is_operation_file)}]" def get_json_template_representation(self, **kwargs: Any) -> Any: kwargs["optional"] = not self.required diff --git a/autorest/codegen/models/schema_response.py b/autorest/codegen/models/schema_response.py index 65716b2b0dd..d11c00b2b40 100644 --- a/autorest/codegen/models/schema_response.py +++ b/autorest/codegen/models/schema_response.py @@ -57,13 +57,12 @@ def serialization_type(self) -> str: return self.schema.serialization_type return "None" - @property - def type_annotation(self) -> str: + def type_annotation(self, *, is_operation_file: bool = False) -> str: if not self.schema: return "None" if self.nullable: - return f"Optional[{self.schema.type_annotation}]" - return self.schema.type_annotation + return f"Optional[{self.schema.type_annotation(is_operation_file=is_operation_file)}]" + return self.schema.type_annotation(is_operation_file=is_operation_file) @property def docstring_text(self) -> str: diff --git a/autorest/codegen/serializers/builder_serializer.py b/autorest/codegen/serializers/builder_serializer.py index 1c15de2ef54..8348cdf60c7 100644 --- a/autorest/codegen/serializers/builder_serializer.py +++ b/autorest/codegen/serializers/builder_serializer.py @@ -644,7 +644,7 @@ def _response_type_annotation(self, builder, modify_if_head_as_boolean: bool = T return "bool" response_body_annotations: OrderedSet[str] = {} for response in [r for r in builder.responses if r.has_body]: - response_body_annotations[response.type_annotation] = None + response_body_annotations[response.type_annotation(is_operation_file=True)] = None response_str = ", ".join(response_body_annotations.keys()) or "None" if len(response_body_annotations) > 1: response_str = f"Union[{response_str}]" @@ -1346,7 +1346,8 @@ def get_long_running_output(self, builder) -> List[str]: if builder.lro_response: if builder.lro_response.has_headers: retval.append(" response_headers = {}") - retval.append(" response = pipeline_response.http_response") + if not self.code_model.options["models_mode"] or builder.lro_response.has_headers: + retval.append(" response = pipeline_response.http_response") retval.extend([ f" {line}" for line in self.response_headers_and_deserialization(builder.lro_response) diff --git a/autorest/codegen/serializers/model_python3_serializer.py b/autorest/codegen/serializers/model_python3_serializer.py index db3d1865265..f12b61a46ca 100644 --- a/autorest/codegen/serializers/model_python3_serializer.py +++ b/autorest/codegen/serializers/model_python3_serializer.py @@ -46,11 +46,11 @@ def properties_to_pass_to_super(self, model: ObjectSchema) -> str: return ", ".join(properties_to_pass_to_super) def required_property_no_default_init(self, prop: Property) -> str: - return f"{prop.name}: {prop.type_annotation}" + return f"{prop.name}: {prop.type_annotation()}" def optional_property_init(self, prop: Property) -> str: default = prop.default_value_declaration - return f"{prop.name}: {prop.type_annotation} = {default}" + return f"{prop.name}: {prop.type_annotation()} = {default}" def initialize_standard_arg(self, prop: Property) -> str: return f"self.{prop.name} = {prop.name}" diff --git a/autorest/codegen/serializers/utils.py b/autorest/codegen/serializers/utils.py index b8815fa0b4c..a72f29054e7 100644 --- a/autorest/codegen/serializers/utils.py +++ b/autorest/codegen/serializers/utils.py @@ -108,10 +108,11 @@ def pop_kwargs_from_signature(kwargs_to_pop: List[Parameter]) -> List[str]: if kwarg.has_default_value: retval.append( f"{kwarg.serialized_name} = kwargs.pop('{kwarg.serialized_name}', " - + f"{kwarg.default_value_declaration}) # type: {kwarg.type_annotation}" + + f"{kwarg.default_value_declaration}) # type: {kwarg.type_annotation(is_operation_file=True)}" ) else: + type_annot = kwarg.type_annotation(is_operation_file=True) retval.append( - f"{kwarg.serialized_name} = kwargs.pop('{kwarg.serialized_name}') # type: {kwarg.type_annotation}" + f"{kwarg.serialized_name} = kwargs.pop('{kwarg.serialized_name}') # type: {type_annot}" ) return retval diff --git a/autorest/codegen/templates/enum.py.jinja2 b/autorest/codegen/templates/enum.py.jinja2 index 3a8c98d7d0a..e69a2978bfd 100644 --- a/autorest/codegen/templates/enum.py.jinja2 +++ b/autorest/codegen/templates/enum.py.jinja2 @@ -1,5 +1,5 @@ -class {{ enum.name }}(with_metaclass(CaseInsensitiveEnumMeta, {{ enum.enum_type.type_annotation }}, Enum)): +class {{ enum.name }}({{ enum.enum_type.type_annotation() }}, Enum, metaclass=CaseInsensitiveEnumMeta): {% if enum.description %} """{{ enum.description | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n ') }} """ diff --git a/autorest/codegen/templates/enum_container.py.jinja2 b/autorest/codegen/templates/enum_container.py.jinja2 index 284a4f6654e..588233f548e 100644 --- a/autorest/codegen/templates/enum_container.py.jinja2 +++ b/autorest/codegen/templates/enum_container.py.jinja2 @@ -2,7 +2,6 @@ {{ code_model.options['license_header'] }} from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta {% for enum in code_model.enums.values() | sort %} diff --git a/autorest/multiapi/models/imports.py b/autorest/multiapi/models/imports.py index 47786b0c4d3..c5b82de5fa2 100644 --- a/autorest/multiapi/models/imports.py +++ b/autorest/multiapi/models/imports.py @@ -4,7 +4,7 @@ # license information. # -------------------------------------------------------------------------- from enum import Enum -from typing import Dict, Optional, Set +from typing import Dict, Optional, Set, Union, Tuple class ImportType(str, Enum): @@ -21,29 +21,39 @@ class TypingSection(str, Enum): class FileImport: def __init__( - self, imports: Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[str]]]]] = None + self, + imports: Dict[ + TypingSection, Dict[ImportType, Dict[str, Set[Optional[Union[str, Tuple[str, str]]]]]] + ] = None ) -> None: # Basic implementation # First level dict: TypingSection # Second level dict: ImportType # Third level dict: the package name. # Fourth level set: None if this import is a "import", the name to import if it's a "from" - self._imports: Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[str]]]]] = imports or dict() + self._imports: Dict[ + TypingSection, Dict[ImportType, Dict[str, Set[Optional[Union[str, Tuple[str, str]]]]]] + ] = imports or dict() def _add_import( self, from_section: str, import_type: ImportType, - name_import: Optional[str] = None, + name_import: Optional[Union[str, Tuple[str, str]]] = None, typing_section: TypingSection = TypingSection.REGULAR ) -> None: + name_input: Optional[Union[str, Tuple[str, str]]] = None + if isinstance(name_import, list): + name_input = tuple(name_import) + else: + name_input = name_import self._imports.setdefault( - typing_section, dict() - ).setdefault( - import_type, dict() - ).setdefault( - from_section, set() - ).add(name_import) + typing_section, dict() + ).setdefault( + import_type, dict() + ).setdefault( + from_section, set() + ).add(name_input) def add_submodule_import( self, @@ -66,7 +76,7 @@ def add_import( self._add_import(name_import, import_type, None, typing_section) @property - def imports(self) -> Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[str]]]]]: + def imports(self) -> Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[Union[str, Tuple[str, str]]]]]]]: return self._imports def merge(self, file_import: "FileImport") -> None: diff --git a/autorest/multiapi/serializers/import_serializer.py b/autorest/multiapi/serializers/import_serializer.py index c436de70157..7bbb7e1c482 100644 --- a/autorest/multiapi/serializers/import_serializer.py +++ b/autorest/multiapi/serializers/import_serializer.py @@ -14,7 +14,9 @@ def _serialize_package(package_name: str, module_list: Set[Optional[str]], delim if module_list != {None}: buffer.append( "from {} import {}".format( - package_name, ", ".join(sorted([mod for mod in module_list if mod is not None])) + package_name, ", ".join(sorted([ + mod if isinstance(mod, str) else f"{mod[0]} as {mod[1]}" for mod in module_list if mod is not None + ])) ) ) return delimiter.join(buffer) diff --git a/docs/samples/specification/directives/generated/azure/directives/sample/aio/operations/_polling_paging_example_operations.py b/docs/samples/specification/directives/generated/azure/directives/sample/aio/operations/_polling_paging_example_operations.py index b9ac1d7ccb5..4b1925f1f9e 100644 --- a/docs/samples/specification/directives/generated/azure/directives/sample/aio/operations/_polling_paging_example_operations.py +++ b/docs/samples/specification/directives/generated/azure/directives/sample/aio/operations/_polling_paging_example_operations.py @@ -28,16 +28,16 @@ class PollingPagingExampleOperationsMixin: async def _basic_polling_initial( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + ) -> Optional[_models.Product]: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -78,9 +78,9 @@ async def _basic_polling_initial( @distributed_trace_async async def begin_basic_polling( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncCustomPoller["_models.Product"]: + ) -> AsyncCustomPoller[_models.Product]: """A simple polling operation. :param product: Product to put. Default value is None. @@ -99,7 +99,7 @@ async def begin_basic_polling( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -116,7 +116,6 @@ async def begin_basic_polling( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -147,7 +146,7 @@ def get_long_running_output(pipeline_response): def basic_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A simple paging operation. :keyword callable cls: A custom type or function that will be passed the direct response @@ -155,7 +154,7 @@ def basic_paging( :rtype: ~my.library.aio.AsyncCustomPager[~azure.directives.sample.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/docs/samples/specification/directives/generated/azure/directives/sample/operations/_polling_paging_example_operations.py b/docs/samples/specification/directives/generated/azure/directives/sample/operations/_polling_paging_example_operations.py index b861ab66763..a2511e72d2f 100644 --- a/docs/samples/specification/directives/generated/azure/directives/sample/operations/_polling_paging_example_operations.py +++ b/docs/samples/specification/directives/generated/azure/directives/sample/operations/_polling_paging_example_operations.py @@ -79,17 +79,17 @@ class PollingPagingExampleOperationsMixin(object): def _basic_polling_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -130,10 +130,10 @@ def _basic_polling_initial( @distributed_trace def begin_basic_polling( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> CustomPoller["_models.Product"] + # type: (...) -> CustomPoller[_models.Product] """A simple polling operation. :param product: Product to put. Default value is None. @@ -151,7 +151,7 @@ def begin_basic_polling( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -168,7 +168,6 @@ def begin_basic_polling( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -200,7 +199,7 @@ def basic_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A simple paging operation. :keyword callable cls: A custom type or function that will be passed the direct response @@ -208,7 +207,7 @@ def basic_paging( :rtype: ~my.library.CustomPager[~azure.directives.sample.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py index 33c572da244..8e4c22b380b 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import TYPE_CHECKING +from . import models as _models + if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any, Iterable, Optional @@ -23,10 +25,10 @@ class MultiapiServiceClientOperationsMixin(object): def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -59,10 +61,10 @@ def begin_test_lro( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -171,7 +173,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py index cdde05c0989..65e11aa5981 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/aio/_operations_mixin.py @@ -14,14 +14,16 @@ from azure.core.async_paging import AsyncItemPaged from azure.core.polling import AsyncLROPoller +from .. import models as _models + class MultiapiServiceClientOperationsMixin(object): async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -55,9 +57,9 @@ async def begin_test_lro( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -163,7 +165,7 @@ async def test_one( # pylint: disable=inconsistent-return-statements def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_metadata.json b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_metadata.json index 41f9869f139..e32b17bfaba 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_metadata.json +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_metadata.json @@ -88,8 +88,8 @@ "operation_group_one": "OperationGroupOneOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { @@ -105,48 +105,48 @@ }, "_test_lro_initial" : { "sync": { - "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[\"_models.Product\"]\n", + "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[_models.Product]\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~azure.multiapi.sample.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~azure.multiapi.sample.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_initial(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e Optional[\"_models.Product\"]:\n", + "signature": "async def _test_lro_initial(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e Optional[_models.Product]:\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~azure.multiapi.sample.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~azure.multiapi.sample.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "begin_test_lro" : { "sync": { - "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[\"_models.Product\"]\n", + "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[_models.Product]\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~azure.multiapi.sample.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.LROPoller[~azure.multiapi.sample.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[\"_models.Product\"]:\n", + "signature": "async def begin_test_lro(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[_models.Product]:\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~azure.multiapi.sample.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns either Product or the result of\n cls(response)\n:rtype: ~azure.core.polling.AsyncLROPoller[~azure.multiapi.sample.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "_test_lro_and_paging_initial" : { "sync": { - "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.PagingResult\"\n", + "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.PagingResult\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~azure.multiapi.sample.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~azure.multiapi.sample.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e \"_models.PagingResult\":\n", + "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e _models.PagingResult:\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~azure.multiapi.sample.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~azure.multiapi.sample.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" }, "begin_test_lro_and_paging" : { "sync": { - "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[\"_models.PagingResult\"]]\n", + "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[_models.PagingResult]]\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~azure.multiapi.sample.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns an iterator like instance of either PagingResult\n or the result of cls(response)\n:rtype:\n ~azure.core.polling.LROPoller[~azure.core.paging.ItemPaged[~azure.multiapi.sample.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[\"_models.PagingResult\"]]:\n", + "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]:\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~azure.multiapi.sample.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns an iterator like instance of either\n PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.polling.AsyncLROPoller[~azure.core.async_paging.AsyncItemPaged[~azure.multiapi.sample.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py index 198f831afe2..2745610a26c 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py @@ -83,16 +83,16 @@ async def test_one( # pylint: disable=inconsistent-return-statements async def _test_lro_initial( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + ) -> Optional[_models.Product]: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -133,9 +133,9 @@ async def _test_lro_initial( @distributed_trace_async async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -154,7 +154,7 @@ async def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -171,7 +171,6 @@ async def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -201,15 +200,15 @@ def get_long_running_output(pipeline_response): async def _test_lro_and_paging_initial( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> "_models.PagingResult": + ) -> _models.PagingResult: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -251,9 +250,9 @@ async def _test_lro_and_paging_initial( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -275,7 +274,7 @@ async def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py index 7ac1ed12c00..1b7c5febb28 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py @@ -207,17 +207,17 @@ def test_one( # pylint: disable=inconsistent-return-statements def _test_lro_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -258,10 +258,10 @@ def _test_lro_initial( @distributed_trace def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -279,7 +279,7 @@ def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -296,7 +296,6 @@ def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -326,16 +325,16 @@ def get_long_running_output(pipeline_response): def _test_lro_and_paging_initial( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> "_models.PagingResult" + # type: (...) -> _models.PagingResult error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -377,10 +376,10 @@ def _test_lro_and_paging_initial( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -402,7 +401,7 @@ def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_metadata.json b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_metadata.json index 2bb458604c6..31d12cf633e 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_metadata.json +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { - "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.ModelTwo\"\n", + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.ModelTwo\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~azure.multiapi.sample.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e \"_models.ModelTwo\":\n", + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e _models.ModelTwo:\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~azure.multiapi.sample.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "id, message" diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py index 426d5db1a22..9411af0322c 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ async def test_one( id: int, message: Optional[str] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -47,7 +47,7 @@ async def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py index 00d217ba387..90b0617d0d7 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelTwo"] = None, + parameter_one: Optional[_models.ModelTwo] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py index c8e58d3b322..879b55f5d2e 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py @@ -103,7 +103,7 @@ def test_one( message=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -121,7 +121,7 @@ def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py index 3bb95809d41..e7acdb641bf 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py @@ -110,10 +110,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelTwo"] + parameter_one=None, # type: Optional[_models.ModelTwo] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -130,7 +130,7 @@ def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_metadata.json b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_metadata.json index cfca4f22e13..700bd0004f4 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_metadata.json +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_paging" : { "sync": { - "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[\"_models.PagingResult\"]\n", + "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[_models.PagingResult]\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~azure.multiapi.sample.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, - "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[\"_models.PagingResult\"]:\n", + "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[_models.PagingResult]:\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.multiapi.sample.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "" diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py index 81dba60557f..057f5c428d3 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ class MultiapiServiceClientOperationsMixin: def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -37,7 +37,7 @@ def test_paging( :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.multiapi.sample.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py index 93b3f82b9e6..ce7a82cf408 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelThree"] = None, + parameter_one: Optional[_models.ModelThree] = None, **kwargs: Any - ) -> "_models.ModelThree": + ) -> _models.ModelThree: """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py index 64f21f12fa4..f546cd61931 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py @@ -44,7 +44,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_four( # pylint: disable=inconsistent-return-statements self, - input: Optional[Union[IO, "_models.SourcePath"]] = None, + input: Optional[Union[IO, _models.SourcePath]] = None, *, content_type: Optional[Union[str, "_models.ContentType"]] = "application/json", **kwargs: Any diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_multiapi_service_client_enums.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_multiapi_service_client_enums.py index 3924e84430f..d90aecf775b 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_multiapi_service_client_enums.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_multiapi_service_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload """ diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py index e931d1f901d..62f1e0a8b0e 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py @@ -93,7 +93,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -101,7 +101,7 @@ def test_paging( :rtype: ~azure.core.paging.ItemPaged[~azure.multiapi.sample.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py index 381dd9e3f22..815f51b18f9 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py @@ -83,10 +83,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelThree"] + parameter_one=None, # type: Optional[_models.ModelThree] **kwargs # type: Any ): - # type: (...) -> "_models.ModelThree" + # type: (...) -> _models.ModelThree """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -103,7 +103,7 @@ def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py index 412e9212cf2..bfc04888789 100644 --- a/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py +++ b/docs/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py @@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_four( # pylint: disable=inconsistent-return-statements self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> None diff --git a/tasks.py b/tasks.py index da5965b4324..2b23cc952f0 100644 --- a/tasks.py +++ b/tasks.py @@ -75,8 +75,8 @@ class _Generator(str, Enum): } _DPG_SWAGGER_MAPPINGS = { - 'DPGServiceDrivenInitial': 'dpg_initial.json', - 'DPGServiceDrivenUpdateOne': 'dpg_update1.json', + 'DPGServiceDrivenInitial': 'dpg-initial.json', + 'DPGServiceDrivenUpdateOne': 'dpg-update1.json', 'DPGCustomizationInitial': 'dpg-customization.json', 'DPGCustomizationCustomized': 'dpg-customization.json', 'DPGTestPostProcessPlugin': 'dpg-customization.json' @@ -318,7 +318,7 @@ def regenerate_vanilla_low_level_client(c, swagger_name=None, debug=False, **kwa @task def regenerate_dpg_version_tolerant(c, swagger_name=None, debug=False, **kwargs): - return _prepare_mapping_and_regenerate( + _prepare_mapping_and_regenerate( c, _DPG_SWAGGER_MAPPINGS, _SwaggerGroup.DPG, @@ -327,6 +327,8 @@ def regenerate_dpg_version_tolerant(c, swagger_name=None, debug=False, **kwargs) version_tolerant=True, **kwargs ) + if not swagger_name: + regenerate_version_tolerant_with_models(c, debug) @task def regenerate_vanilla_version_tolerant(c, swagger_name=None, debug=False, **kwargs): @@ -602,3 +604,9 @@ def regenerate_python3_only(c, debug=False): "package-name": "bodycomplexpython3only", } _regenerate(mapping, debug, swagger_group=_SwaggerGroup.VANILLA, override_flags=override_flags) + +@task +def regenerate_version_tolerant_with_models(c, debug=False): + mapping = {'DPGTestModels': 'dpg-customization.json'} + override_flags = {"models-mode": "msrest"} + _regenerate(mapping, debug, swagger_group=_SwaggerGroup.DPG, override_flags=override_flags, version_tolerant=True) diff --git a/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py b/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py index 39ff90ebae9..1acdf2af014 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py @@ -56,7 +56,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def post_required( # pylint: disable=inconsistent-return-statements self, - parameter_grouping_post_required_parameters: "_models.ParameterGroupingPostRequiredParameters", + parameter_grouping_post_required_parameters: _models.ParameterGroupingPostRequiredParameters, **kwargs: Any ) -> None: """Post a bunch of required parameters grouped. @@ -115,7 +115,7 @@ async def post_required( # pylint: disable=inconsistent-return-statements @distributed_trace_async async def post_optional( # pylint: disable=inconsistent-return-statements self, - parameter_grouping_post_optional_parameters: Optional["_models.ParameterGroupingPostOptionalParameters"] = None, + parameter_grouping_post_optional_parameters: Optional[_models.ParameterGroupingPostOptionalParameters] = None, **kwargs: Any ) -> None: """Post a bunch of optional parameters grouped. @@ -166,7 +166,7 @@ async def post_optional( # pylint: disable=inconsistent-return-statements async def post_reserved_words( # pylint: disable=inconsistent-return-statements self, parameter_grouping_post_reserved_words_parameters: Optional[ - "_models.ParameterGroupingPostReservedWordsParameters" + _models.ParameterGroupingPostReservedWordsParameters ] = None, **kwargs: Any ) -> None: @@ -218,9 +218,9 @@ async def post_reserved_words( # pylint: disable=inconsistent-return-statements @distributed_trace_async async def post_multi_param_groups( # pylint: disable=inconsistent-return-statements self, - first_parameter_group: Optional["_models.FirstParameterGroup"] = None, + first_parameter_group: Optional[_models.FirstParameterGroup] = None, parameter_grouping_post_multi_param_groups_second_param_group: Optional[ - "_models.ParameterGroupingPostMultiParamGroupsSecondParamGroup" + _models.ParameterGroupingPostMultiParamGroupsSecondParamGroup ] = None, **kwargs: Any ) -> None: @@ -280,7 +280,7 @@ async def post_multi_param_groups( # pylint: disable=inconsistent-return-statem @distributed_trace_async async def post_shared_parameter_group_object( # pylint: disable=inconsistent-return-statements - self, first_parameter_group: Optional["_models.FirstParameterGroup"] = None, **kwargs: Any + self, first_parameter_group: Optional[_models.FirstParameterGroup] = None, **kwargs: Any ) -> None: """Post parameters with a shared parameter group object. diff --git a/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py b/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py index f0e696f59f4..cafb749e9d8 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py @@ -227,7 +227,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def post_required( # pylint: disable=inconsistent-return-statements self, - parameter_grouping_post_required_parameters, # type: "_models.ParameterGroupingPostRequiredParameters" + parameter_grouping_post_required_parameters, # type: _models.ParameterGroupingPostRequiredParameters **kwargs # type: Any ): # type: (...) -> None @@ -287,7 +287,7 @@ def post_required( # pylint: disable=inconsistent-return-statements @distributed_trace def post_optional( # pylint: disable=inconsistent-return-statements self, - parameter_grouping_post_optional_parameters=None, # type: Optional["_models.ParameterGroupingPostOptionalParameters"] + parameter_grouping_post_optional_parameters=None, # type: Optional[_models.ParameterGroupingPostOptionalParameters] **kwargs # type: Any ): # type: (...) -> None @@ -338,7 +338,7 @@ def post_optional( # pylint: disable=inconsistent-return-statements @distributed_trace def post_reserved_words( # pylint: disable=inconsistent-return-statements self, - parameter_grouping_post_reserved_words_parameters=None, # type: Optional["_models.ParameterGroupingPostReservedWordsParameters"] + parameter_grouping_post_reserved_words_parameters=None, # type: Optional[_models.ParameterGroupingPostReservedWordsParameters] **kwargs # type: Any ): # type: (...) -> None @@ -390,8 +390,8 @@ def post_reserved_words( # pylint: disable=inconsistent-return-statements @distributed_trace def post_multi_param_groups( # pylint: disable=inconsistent-return-statements self, - first_parameter_group=None, # type: Optional["_models.FirstParameterGroup"] - parameter_grouping_post_multi_param_groups_second_param_group=None, # type: Optional["_models.ParameterGroupingPostMultiParamGroupsSecondParamGroup"] + first_parameter_group=None, # type: Optional[_models.FirstParameterGroup] + parameter_grouping_post_multi_param_groups_second_param_group=None, # type: Optional[_models.ParameterGroupingPostMultiParamGroupsSecondParamGroup] **kwargs # type: Any ): # type: (...) -> None @@ -452,7 +452,7 @@ def post_multi_param_groups( # pylint: disable=inconsistent-return-statements @distributed_trace def post_shared_parameter_group_object( # pylint: disable=inconsistent-return-statements self, - first_parameter_group=None, # type: Optional["_models.FirstParameterGroup"] + first_parameter_group=None, # type: Optional[_models.FirstParameterGroup] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py b/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py index 890695a700e..1019dd878ca 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py @@ -98,7 +98,7 @@ async def custom_named_request_id( # pylint: disable=inconsistent-return-statem @distributed_trace_async async def custom_named_request_id_param_grouping( # pylint: disable=inconsistent-return-statements self, - header_custom_named_request_id_param_grouping_parameters: "_models.HeaderCustomNamedRequestIdParamGroupingParameters", + header_custom_named_request_id_param_grouping_parameters: _models.HeaderCustomNamedRequestIdParamGroupingParameters, **kwargs: Any ) -> None: """Send foo-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 in the header of the request, diff --git a/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py b/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py index 08115a7955c..704e6493d8d 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py @@ -173,7 +173,7 @@ def custom_named_request_id( # pylint: disable=inconsistent-return-statements @distributed_trace def custom_named_request_id_param_grouping( # pylint: disable=inconsistent-return-statements self, - header_custom_named_request_id_param_grouping_parameters, # type: "_models.HeaderCustomNamedRequestIdParamGroupingParameters" + header_custom_named_request_id_param_grouping_parameters, # type: _models.HeaderCustomNamedRequestIdParamGroupingParameters **kwargs # type: Any ): # type: (...) -> None diff --git a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py index c92fb58403e..8042241455c 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py @@ -50,7 +50,7 @@ def __init__(self, *args, **kwargs) -> None: def get_no_item_name_pages( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResultValue"]: + ) -> AsyncIterable[_models.ProductResultValue]: """A paging operation that must return result of the default 'value' node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -58,7 +58,7 @@ def get_no_item_name_pages( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResultValue] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -116,7 +116,7 @@ async def get_next(next_link=None): def get_null_next_link_name_pages( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :keyword callable cls: A custom type or function that will be passed the direct response @@ -124,7 +124,7 @@ def get_null_next_link_name_pages( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -182,7 +182,7 @@ async def get_next(next_link=None): def get_single_pages( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that finishes on the first call without a nextlink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -191,7 +191,7 @@ def get_single_pages( ~custompollerpagerdefinitions.aio.AsyncCustomPager[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -249,7 +249,7 @@ async def get_next(next_link=None): def first_response_empty( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResultValue"]: + ) -> AsyncIterable[_models.ProductResultValue]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -258,7 +258,7 @@ def first_response_empty( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResultValue] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -316,9 +316,9 @@ async def get_next(next_link=None): def get_multiple_pages( self, client_request_id: Optional[str] = None, - paging_get_multiple_pages_options: Optional["_models.PagingGetMultiplePagesOptions"] = None, + paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -331,7 +331,7 @@ def get_multiple_pages( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -406,7 +406,7 @@ def get_with_query_params( self, required_query_parameter: int, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -423,7 +423,7 @@ def get_with_query_params( :raises: ~azure.core.exceptions.HttpResponseError """ query_constant = kwargs.pop('query_constant', True) # type: bool - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -485,7 +485,7 @@ def duplicate_params( self, filter: Optional[str] = None, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -497,7 +497,7 @@ def duplicate_params( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -557,9 +557,9 @@ async def get_next(next_link=None): def get_odata_multiple_pages( self, client_request_id: Optional[str] = None, - paging_get_odata_multiple_pages_options: Optional["_models.PagingGetOdataMultiplePagesOptions"] = None, + paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncIterable["_models.OdataProductResult"]: + ) -> AsyncIterable[_models.OdataProductResult]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -572,7 +572,7 @@ def get_odata_multiple_pages( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.OdataProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -645,10 +645,10 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_with_offset( self, - paging_get_multiple_pages_with_offset_options: "_models.PagingGetMultiplePagesWithOffsetOptions", + paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. @@ -661,7 +661,7 @@ def get_multiple_pages_with_offset( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -741,7 +741,7 @@ async def get_next(next_link=None): def get_multiple_pages_retry_first( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -750,7 +750,7 @@ def get_multiple_pages_retry_first( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -808,7 +808,7 @@ async def get_next(next_link=None): def get_multiple_pages_retry_second( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -817,7 +817,7 @@ def get_multiple_pages_retry_second( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -875,7 +875,7 @@ async def get_next(next_link=None): def get_single_pages_failure( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that receives a 400 on the first call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -883,7 +883,7 @@ def get_single_pages_failure( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -941,7 +941,7 @@ async def get_next(next_link=None): def get_multiple_pages_failure( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that receives a 400 on the second call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -949,7 +949,7 @@ def get_multiple_pages_failure( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1007,7 +1007,7 @@ async def get_next(next_link=None): def get_multiple_pages_failure_uri( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that receives an invalid nextLink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1015,7 +1015,7 @@ def get_multiple_pages_failure_uri( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1075,7 +1075,7 @@ def get_multiple_pages_fragment_next_link( api_version: str, tenant: str, **kwargs: Any - ) -> AsyncIterable["_models.OdataProductResult"]: + ) -> AsyncIterable[_models.OdataProductResult]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. @@ -1087,7 +1087,7 @@ def get_multiple_pages_fragment_next_link( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.OdataProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1149,9 +1149,9 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( self, - custom_parameter_group: "_models.CustomParameterGroup", + custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any - ) -> AsyncIterable["_models.OdataProductResult"]: + ) -> AsyncIterable[_models.OdataProductResult]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. @@ -1161,7 +1161,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.OdataProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1233,15 +1233,15 @@ async def get_next(next_link=None): async def _get_multiple_pages_lro_initial( self, client_request_id: Optional[str] = None, - paging_get_multiple_pages_lro_options: Optional["_models.PagingGetMultiplePagesLroOptions"] = None, + paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any - ) -> "_models.ProductResult": + ) -> _models.ProductResult: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] _maxresults = None _timeout = None @@ -1283,9 +1283,9 @@ async def _get_multiple_pages_lro_initial( async def begin_get_multiple_pages_lro( self, client_request_id: Optional[str] = None, - paging_get_multiple_pages_lro_options: Optional["_models.PagingGetMultiplePagesLroOptions"] = None, + paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any - ) -> AsyncCustomPoller[AsyncItemPaged["_models.ProductResult"]]: + ) -> AsyncCustomPoller[AsyncItemPaged[_models.ProductResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1308,7 +1308,7 @@ async def begin_get_multiple_pages_lro( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1423,7 +1423,7 @@ async def internal_get_next(next_link=None): def get_paging_model_with_item_name_with_xms_client_name( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResultValueWithXMSClientName"]: + ) -> AsyncIterable[_models.ProductResultValueWithXMSClientName]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. @@ -1434,7 +1434,7 @@ def get_paging_model_with_item_name_with_xms_client_name( ~azure.core.async_paging.AsyncItemPaged[~custompollerpager.models.ProductResultValueWithXMSClientName] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResultValueWithXMSClientName"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResultValueWithXMSClientName] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_auto_rest_paging_test_service_enums.py b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_auto_rest_paging_test_service_enums.py index e1fb240ac9f..f7a0977d6f5 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_auto_rest_paging_test_service_enums.py +++ b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_auto_rest_paging_test_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class OperationResultStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class OperationResultStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The status of the request """ diff --git a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py index f994aee5f8c..1ce0e5fa13f 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py +++ b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py @@ -10,8 +10,6 @@ import msrest.serialization -from ._auto_rest_paging_test_service_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py index ba6a15ee80d..7e876d3d68e 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py @@ -605,7 +605,7 @@ def get_no_item_name_pages( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResultValue"] + # type: (...) -> Iterable[_models.ProductResultValue] """A paging operation that must return result of the default 'value' node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -613,7 +613,7 @@ def get_no_item_name_pages( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResultValue] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -672,7 +672,7 @@ def get_null_next_link_name_pages( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that must ignore any kind of nextLink, and stop after page 1. :keyword callable cls: A custom type or function that will be passed the direct response @@ -680,7 +680,7 @@ def get_null_next_link_name_pages( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -739,7 +739,7 @@ def get_single_pages( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that finishes on the first call without a nextlink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -747,7 +747,7 @@ def get_single_pages( :rtype: ~custompollerpagerdefinitions.CustomPager[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -806,7 +806,7 @@ def first_response_empty( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResultValue"] + # type: (...) -> Iterable[_models.ProductResultValue] """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -815,7 +815,7 @@ def first_response_empty( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResultValue] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -873,10 +873,10 @@ def get_next(next_link=None): def get_multiple_pages( self, client_request_id=None, # type: Optional[str] - paging_get_multiple_pages_options=None, # type: Optional["_models.PagingGetMultiplePagesOptions"] + paging_get_multiple_pages_options=None, # type: Optional[_models.PagingGetMultiplePagesOptions] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -889,7 +889,7 @@ def get_multiple_pages( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -965,7 +965,7 @@ def get_with_query_params( required_query_parameter, # type: int **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -982,7 +982,7 @@ def get_with_query_params( :raises: ~azure.core.exceptions.HttpResponseError """ query_constant = kwargs.pop('query_constant', True) # type: bool - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1045,7 +1045,7 @@ def duplicate_params( filter=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -1057,7 +1057,7 @@ def duplicate_params( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1117,10 +1117,10 @@ def get_next(next_link=None): def get_odata_multiple_pages( self, client_request_id=None, # type: Optional[str] - paging_get_odata_multiple_pages_options=None, # type: Optional["_models.PagingGetOdataMultiplePagesOptions"] + paging_get_odata_multiple_pages_options=None, # type: Optional[_models.PagingGetOdataMultiplePagesOptions] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.OdataProductResult"] + # type: (...) -> Iterable[_models.OdataProductResult] """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -1133,7 +1133,7 @@ def get_odata_multiple_pages( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.OdataProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1206,11 +1206,11 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_with_offset( self, - paging_get_multiple_pages_with_offset_options, # type: "_models.PagingGetMultiplePagesWithOffsetOptions" + paging_get_multiple_pages_with_offset_options, # type: _models.PagingGetMultiplePagesWithOffsetOptions client_request_id=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. @@ -1223,7 +1223,7 @@ def get_multiple_pages_with_offset( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1304,7 +1304,7 @@ def get_multiple_pages_retry_first( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1313,7 +1313,7 @@ def get_multiple_pages_retry_first( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1372,7 +1372,7 @@ def get_multiple_pages_retry_second( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1381,7 +1381,7 @@ def get_multiple_pages_retry_second( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1440,7 +1440,7 @@ def get_single_pages_failure( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that receives a 400 on the first call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1448,7 +1448,7 @@ def get_single_pages_failure( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1507,7 +1507,7 @@ def get_multiple_pages_failure( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that receives a 400 on the second call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1515,7 +1515,7 @@ def get_multiple_pages_failure( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1574,7 +1574,7 @@ def get_multiple_pages_failure_uri( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that receives an invalid nextLink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1582,7 +1582,7 @@ def get_multiple_pages_failure_uri( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1643,7 +1643,7 @@ def get_multiple_pages_fragment_next_link( tenant, # type: str **kwargs # type: Any ): - # type: (...) -> Iterable["_models.OdataProductResult"] + # type: (...) -> Iterable[_models.OdataProductResult] """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. @@ -1655,7 +1655,7 @@ def get_multiple_pages_fragment_next_link( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.OdataProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1717,10 +1717,10 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( self, - custom_parameter_group, # type: "_models.CustomParameterGroup" + custom_parameter_group, # type: _models.CustomParameterGroup **kwargs # type: Any ): - # type: (...) -> Iterable["_models.OdataProductResult"] + # type: (...) -> Iterable[_models.OdataProductResult] """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. @@ -1730,7 +1730,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( :rtype: ~azure.core.paging.ItemPaged[~custompollerpager.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.OdataProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1802,16 +1802,16 @@ def get_next(next_link=None): def _get_multiple_pages_lro_initial( self, client_request_id=None, # type: Optional[str] - paging_get_multiple_pages_lro_options=None, # type: Optional["_models.PagingGetMultiplePagesLroOptions"] + paging_get_multiple_pages_lro_options=None, # type: Optional[_models.PagingGetMultiplePagesLroOptions] **kwargs # type: Any ): - # type: (...) -> "_models.ProductResult" + # type: (...) -> _models.ProductResult error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] _maxresults = None _timeout = None @@ -1853,10 +1853,10 @@ def _get_multiple_pages_lro_initial( def begin_get_multiple_pages_lro( self, client_request_id=None, # type: Optional[str] - paging_get_multiple_pages_lro_options=None, # type: Optional["_models.PagingGetMultiplePagesLroOptions"] + paging_get_multiple_pages_lro_options=None, # type: Optional[_models.PagingGetMultiplePagesLroOptions] **kwargs # type: Any ): - # type: (...) -> CustomPoller[ItemPaged["_models.ProductResult"]] + # type: (...) -> CustomPoller[ItemPaged[_models.ProductResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1879,7 +1879,7 @@ def begin_get_multiple_pages_lro( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -1995,7 +1995,7 @@ def get_paging_model_with_item_name_with_xms_client_name( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResultValueWithXMSClientName"] + # type: (...) -> Iterable[_models.ProductResultValueWithXMSClientName] """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. @@ -2006,7 +2006,7 @@ def get_paging_model_with_item_name_with_xms_client_name( ~azure.core.paging.ItemPaged[~custompollerpager.models.ProductResultValueWithXMSClientName] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ProductResultValueWithXMSClientName"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ProductResultValueWithXMSClientName] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py b/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py index 95ba3e4d875..fbb5cce95d4 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py @@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that combines custom url, paging and partial URL and expect to concat after host. @@ -64,7 +64,7 @@ def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> AsyncIterab :rtype: ~azure.core.async_paging.AsyncItemPaged[~custombaseurlpaging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -127,9 +127,7 @@ async def get_next(next_link=None): get_pages_partial_url.metadata = {"url": "/paging/customurl/partialnextlink"} # type: ignore @distributed_trace - def get_pages_partial_url_operation( - self, account_name: str, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that combines custom url, paging and partial URL with next operation. :param account_name: Account Name. @@ -139,7 +137,7 @@ def get_pages_partial_url_operation( :rtype: ~azure.core.async_paging.AsyncItemPaged[~custombaseurlpaging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) diff --git a/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py b/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py index 6f5a0aa1c0a..530ea44a287 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py @@ -128,7 +128,7 @@ def get_pages_partial_url( account_name, # type: str **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that combines custom url, paging and partial URL and expect to concat after host. @@ -139,7 +139,7 @@ def get_pages_partial_url( :rtype: ~azure.core.paging.ItemPaged[~custombaseurlpaging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -207,7 +207,7 @@ def get_pages_partial_url_operation( account_name, # type: str **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that combines custom url, paging and partial URL with next operation. :param account_name: Account Name. @@ -217,7 +217,7 @@ def get_pages_partial_url_operation( :rtype: ~azure.core.paging.ItemPaged[~custombaseurlpaging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py index 436a6689b26..c65bc884c4b 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py @@ -56,13 +56,13 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") async def _put_async_retry_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -104,8 +104,8 @@ async def _put_async_retry_succeeded_initial( @distributed_trace_async async def begin_put_async_retry_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 is required message header for all requests. Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the @@ -127,7 +127,7 @@ async def begin_put_async_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -169,13 +169,13 @@ def get_long_running_output(pipeline_response): begin_put_async_retry_succeeded.metadata = {"url": "/lro/customheader/putasync/retry/succeeded"} # type: ignore async def _put201_creating_succeeded200_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -214,8 +214,8 @@ async def _put201_creating_succeeded200_initial( @distributed_trace_async async def begin_put201_creating_succeeded200( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 is required message header for all requests. Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll @@ -237,7 +237,7 @@ async def begin_put201_creating_succeeded200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -248,7 +248,6 @@ async def begin_put201_creating_succeeded200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -272,7 +271,7 @@ def get_long_running_output(pipeline_response): begin_put201_creating_succeeded200.metadata = {"url": "/lro/customheader/put/201/creating/succeeded/200"} # type: ignore async def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -313,7 +312,7 @@ async def _post202_retry200_initial( # pylint: disable=inconsistent-return-stat @distributed_trace_async async def begin_post202_retry200( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 is required message header for all requests. Long running post request, service returns a 202 to the initial request, with @@ -366,7 +365,7 @@ def get_long_running_output(pipeline_response): begin_post202_retry200.metadata = {"url": "/lro/customheader/post/202/retry/200"} # type: ignore async def _post_async_retry_succeeded_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -410,7 +409,7 @@ async def _post_async_retry_succeeded_initial( # pylint: disable=inconsistent-r @distributed_trace_async async def begin_post_async_retry_succeeded( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 is required message header for all requests. Long running post request, service returns a 202 to the initial request, with an diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py index 383e5cda2b2..251d67f4314 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py @@ -59,13 +59,13 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") async def _put201_creating_succeeded200_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -104,8 +104,8 @@ async def _put201_creating_succeeded200_initial( @distributed_trace_async async def begin_put201_creating_succeeded200( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 500, then a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -126,7 +126,7 @@ async def begin_put201_creating_succeeded200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -137,7 +137,6 @@ async def begin_put201_creating_succeeded200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -161,13 +160,13 @@ def get_long_running_output(pipeline_response): begin_put201_creating_succeeded200.metadata = {"url": "/lro/retryerror/put/201/creating/succeeded/200"} # type: ignore async def _put_async_relative_retry_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -209,8 +208,8 @@ async def _put_async_relative_retry_succeeded_initial( @distributed_trace_async async def begin_put_async_relative_retry_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 500, then a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -231,7 +230,7 @@ async def begin_put_async_relative_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -272,11 +271,11 @@ def get_long_running_output(pipeline_response): begin_put_async_relative_retry_succeeded.metadata = {"url": "/lro/retryerror/putasync/retry/succeeded"} # type: ignore - async def _delete_provisioning202_accepted200_succeeded_initial(self, **kwargs: Any) -> "_models.Product": + async def _delete_provisioning202_accepted200_succeeded_initial(self, **kwargs: Any) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_accepted200_succeeded_request_initial( template_url=self._delete_provisioning202_accepted200_succeeded_initial.metadata["url"], @@ -313,7 +312,7 @@ async def _delete_provisioning202_accepted200_succeeded_initial(self, **kwargs: @distributed_trace_async async def begin_delete_provisioning202_accepted200_succeeded( self, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Long running delete request, service returns a 500, then a 202 to the initial request, with an entity that contains ProvisioningState=’Accepted’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -331,7 +330,7 @@ async def begin_delete_provisioning202_accepted200_succeeded( :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -342,7 +341,6 @@ async def begin_delete_provisioning202_accepted200_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -531,7 +529,7 @@ def get_long_running_output(pipeline_response): begin_delete_async_relative_retry_succeeded.metadata = {"url": "/lro/retryerror/deleteasync/retry/succeeded"} # type: ignore async def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -572,7 +570,7 @@ async def _post202_retry200_initial( # pylint: disable=inconsistent-return-stat @distributed_trace_async async def begin_post202_retry200( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 500, then a 202 to the initial request, with 'Location' and 'Retry-After' headers, Polls return a 200 with a response body after success. @@ -624,7 +622,7 @@ def get_long_running_output(pipeline_response): begin_post202_retry200.metadata = {"url": "/lro/retryerror/post/202/retry/200"} # type: ignore async def _post_async_relative_retry_succeeded_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -668,7 +666,7 @@ async def _post_async_relative_retry_succeeded_initial( # pylint: disable=incon @distributed_trace_async async def begin_post_async_relative_retry_succeeded( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 500, then a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py index 72804ed1c58..fbe5957195c 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py @@ -96,13 +96,13 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") async def _put200_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> Optional[_models.Product]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -139,8 +139,8 @@ async def _put200_succeeded_initial( @distributed_trace_async async def begin_put200_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Succeeded’. @@ -160,7 +160,7 @@ async def begin_put200_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -171,7 +171,6 @@ async def begin_put200_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -195,13 +194,13 @@ def get_long_running_output(pipeline_response): begin_put200_succeeded.metadata = {"url": "/lro/put/200/succeeded"} # type: ignore async def _patch200_succeeded_ignore_headers_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -241,8 +240,8 @@ async def _patch200_succeeded_ignore_headers_initial( @distributed_trace_async async def begin_patch200_succeeded_ignore_headers( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request with location header. We should not have any subsequent calls after receiving this first response. @@ -262,7 +261,7 @@ async def begin_patch200_succeeded_ignore_headers( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -302,13 +301,13 @@ def get_long_running_output(pipeline_response): begin_patch200_succeeded_ignore_headers.metadata = {"url": "/lro/patch/200/succeeded/ignoreheaders"} # type: ignore async def _patch201_retry_with_async_header_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -352,8 +351,8 @@ async def _patch201_retry_with_async_header_initial( @distributed_trace_async async def begin_patch201_retry_with_async_header( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running patch request, service returns a 201 to the initial request with async header. :param product: Product to patch. Default value is None. @@ -372,7 +371,7 @@ async def begin_patch201_retry_with_async_header( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -383,7 +382,6 @@ async def begin_patch201_retry_with_async_header( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -410,13 +408,13 @@ def get_long_running_output(pipeline_response): begin_patch201_retry_with_async_header.metadata = {"url": "/lro/patch/201/retry/onlyAsyncHeader"} # type: ignore async def _patch202_retry_with_async_and_location_header_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -461,8 +459,8 @@ async def _patch202_retry_with_async_and_location_header_initial( @distributed_trace_async async def begin_patch202_retry_with_async_and_location_header( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running patch request, service returns a 202 to the initial request with async and location header. @@ -482,7 +480,7 @@ async def begin_patch202_retry_with_async_and_location_header( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -493,7 +491,6 @@ async def begin_patch202_retry_with_async_and_location_header( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -517,13 +514,13 @@ def get_long_running_output(pipeline_response): begin_patch202_retry_with_async_and_location_header.metadata = {"url": "/lro/patch/202/retry/asyncAndLocationHeader"} # type: ignore async def _put201_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -558,8 +555,8 @@ async def _put201_succeeded_initial( @distributed_trace_async async def begin_put201_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Succeeded’. @@ -579,7 +576,7 @@ async def begin_put201_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -590,7 +587,6 @@ async def begin_put201_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -613,11 +609,11 @@ def get_long_running_output(pipeline_response): begin_put201_succeeded.metadata = {"url": "/lro/put/201/succeeded"} # type: ignore - async def _post202_list_initial(self, **kwargs: Any) -> Optional[List["_models.Product"]]: + async def _post202_list_initial(self, **kwargs: Any) -> Optional[List[_models.Product]]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional[List["_models.Product"]]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[List[_models.Product]]] request = build_post202_list_request_initial( template_url=self._post202_list_initial.metadata["url"], @@ -653,7 +649,7 @@ async def _post202_list_initial(self, **kwargs: Any) -> Optional[List["_models.P _post202_list_initial.metadata = {"url": "/lro/list"} # 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' }]. @@ -670,7 +666,7 @@ async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[List["_model :rtype: ~azure.core.polling.AsyncLROPoller[list[~lro.models.Product]] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -679,7 +675,6 @@ async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[List["_model kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("[Product]", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -703,13 +698,13 @@ def get_long_running_output(pipeline_response): begin_post202_list.metadata = {"url": "/lro/list"} # type: ignore async def _put200_succeeded_no_state_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -744,8 +739,8 @@ async def _put200_succeeded_no_state_initial( @distributed_trace_async async def begin_put200_succeeded_no_state( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that does not contain ProvisioningState=’Succeeded’. @@ -765,7 +760,7 @@ async def begin_put200_succeeded_no_state( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -776,7 +771,6 @@ async def begin_put200_succeeded_no_state( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -800,13 +794,13 @@ def get_long_running_output(pipeline_response): begin_put200_succeeded_no_state.metadata = {"url": "/lro/put/200/succeeded/nostate"} # type: ignore async def _put202_retry200_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -841,8 +835,8 @@ async def _put202_retry200_initial( @distributed_trace_async async def begin_put202_retry200( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 202 to the initial request, with a location header that points to a polling URL that returns a 200 and an entity that doesn't contains ProvisioningState. @@ -863,7 +857,7 @@ async def begin_put202_retry200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -874,7 +868,6 @@ async def begin_put202_retry200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -898,13 +891,13 @@ def get_long_running_output(pipeline_response): begin_put202_retry200.metadata = {"url": "/lro/put/202/retry/200"} # type: ignore async def _put201_creating_succeeded200_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -943,8 +936,8 @@ async def _put201_creating_succeeded200_initial( @distributed_trace_async async def begin_put201_creating_succeeded200( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -965,7 +958,7 @@ async def begin_put201_creating_succeeded200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -976,7 +969,6 @@ async def begin_put201_creating_succeeded200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1000,13 +992,13 @@ def get_long_running_output(pipeline_response): begin_put201_creating_succeeded200.metadata = {"url": "/lro/put/201/creating/succeeded/200"} # type: ignore async def _put200_updating_succeeded204_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1041,8 +1033,8 @@ async def _put200_updating_succeeded204_initial( @distributed_trace_async async def begin_put200_updating_succeeded204( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Updating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -1063,7 +1055,7 @@ async def begin_put200_updating_succeeded204( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1074,7 +1066,6 @@ async def begin_put200_updating_succeeded204( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1098,13 +1089,13 @@ def get_long_running_output(pipeline_response): begin_put200_updating_succeeded204.metadata = {"url": "/lro/put/200/updating/succeeded/200"} # type: ignore async def _put201_creating_failed200_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1143,8 +1134,8 @@ async def _put201_creating_failed200_initial( @distributed_trace_async async def begin_put201_creating_failed200( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Created’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Failed’. @@ -1165,7 +1156,7 @@ async def begin_put201_creating_failed200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1176,7 +1167,6 @@ async def begin_put201_creating_failed200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1200,13 +1190,13 @@ def get_long_running_output(pipeline_response): begin_put201_creating_failed200.metadata = {"url": "/lro/put/201/created/failed/200"} # type: ignore async def _put200_acceptedcanceled200_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1241,8 +1231,8 @@ async def _put200_acceptedcanceled200_initial( @distributed_trace_async async def begin_put200_acceptedcanceled200( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Canceled’. @@ -1263,7 +1253,7 @@ async def begin_put200_acceptedcanceled200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1274,7 +1264,6 @@ async def begin_put200_acceptedcanceled200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1298,13 +1287,13 @@ def get_long_running_output(pipeline_response): begin_put200_acceptedcanceled200.metadata = {"url": "/lro/put/200/accepted/canceled/200"} # type: ignore async def _put_no_header_in_retry_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1342,8 +1331,8 @@ async def _put_no_header_in_retry_initial( @distributed_trace_async async def begin_put_no_header_in_retry( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 202 to the initial request with location header. Subsequent calls to operation status do not contain location header. @@ -1363,7 +1352,7 @@ async def begin_put_no_header_in_retry( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1401,13 +1390,13 @@ def get_long_running_output(pipeline_response): begin_put_no_header_in_retry.metadata = {"url": "/lro/put/noheader/202/200"} # type: ignore async def _put_async_retry_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1449,8 +1438,8 @@ async def _put_async_retry_succeeded_initial( @distributed_trace_async async def begin_put_async_retry_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1471,7 +1460,7 @@ async def begin_put_async_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1513,13 +1502,13 @@ def get_long_running_output(pipeline_response): begin_put_async_retry_succeeded.metadata = {"url": "/lro/putasync/retry/succeeded"} # type: ignore async def _put_async_no_retry_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1560,8 +1549,8 @@ async def _put_async_no_retry_succeeded_initial( @distributed_trace_async async def begin_put_async_no_retry_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1582,7 +1571,7 @@ async def begin_put_async_no_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1623,13 +1612,13 @@ def get_long_running_output(pipeline_response): begin_put_async_no_retry_succeeded.metadata = {"url": "/lro/putasync/noretry/succeeded"} # type: ignore async def _put_async_retry_failed_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1671,8 +1660,8 @@ async def _put_async_retry_failed_initial( @distributed_trace_async async def begin_put_async_retry_failed( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1693,7 +1682,7 @@ async def begin_put_async_retry_failed( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1735,13 +1724,13 @@ def get_long_running_output(pipeline_response): begin_put_async_retry_failed.metadata = {"url": "/lro/putasync/retry/failed"} # type: ignore async def _put_async_no_retrycanceled_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1782,8 +1771,8 @@ async def _put_async_no_retrycanceled_initial( @distributed_trace_async async def begin_put_async_no_retrycanceled( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1804,7 +1793,7 @@ async def begin_put_async_no_retrycanceled( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1845,13 +1834,13 @@ def get_long_running_output(pipeline_response): begin_put_async_no_retrycanceled.metadata = {"url": "/lro/putasync/noretry/canceled"} # type: ignore async def _put_async_no_header_in_retry_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1891,8 +1880,8 @@ async def _put_async_no_header_in_retry_initial( @distributed_trace_async async def begin_put_async_no_header_in_retry( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 202 to the initial request with Azure-AsyncOperation header. Subsequent calls to operation status do not contain Azure-AsyncOperation header. @@ -1913,7 +1902,7 @@ async def begin_put_async_no_header_in_retry( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1952,12 +1941,12 @@ def get_long_running_output(pipeline_response): begin_put_async_no_header_in_retry.metadata = {"url": "/lro/putasync/noheader/201/200"} # type: ignore - async def _put_non_resource_initial(self, sku: Optional["_models.Sku"] = None, **kwargs: Any) -> "_models.Sku": + async def _put_non_resource_initial(self, sku: Optional[_models.Sku] = None, **kwargs: Any) -> _models.Sku: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] if sku is not None: _json = self._serialize.body(sku, "Sku") @@ -1992,8 +1981,8 @@ async def _put_non_resource_initial(self, sku: Optional["_models.Sku"] = None, * @distributed_trace_async async def begin_put_non_resource( - self, sku: Optional["_models.Sku"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Sku"]: + self, sku: Optional[_models.Sku] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Sku]: """Long running put request with non resource. :param sku: sku to put. Default value is None. @@ -2011,7 +2000,7 @@ async def begin_put_non_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2022,7 +2011,6 @@ async def begin_put_non_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Sku", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2045,14 +2033,12 @@ def get_long_running_output(pipeline_response): begin_put_non_resource.metadata = {"url": "/lro/putnonresource/202/200"} # type: ignore - async def _put_async_non_resource_initial( - self, sku: Optional["_models.Sku"] = None, **kwargs: Any - ) -> "_models.Sku": + async def _put_async_non_resource_initial(self, sku: Optional[_models.Sku] = None, **kwargs: Any) -> _models.Sku: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] if sku is not None: _json = self._serialize.body(sku, "Sku") @@ -2087,8 +2073,8 @@ async def _put_async_non_resource_initial( @distributed_trace_async async def begin_put_async_non_resource( - self, sku: Optional["_models.Sku"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Sku"]: + self, sku: Optional[_models.Sku] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Sku]: """Long running put request with non resource. :param sku: Sku to put. Default value is None. @@ -2106,7 +2092,7 @@ async def begin_put_async_non_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2117,7 +2103,6 @@ async def begin_put_async_non_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Sku", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2142,12 +2127,12 @@ def get_long_running_output(pipeline_response): async def _put_sub_resource_initial( self, provisioning_state: Optional[str] = None, **kwargs: Any - ) -> "_models.SubProduct": + ) -> _models.SubProduct: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] _product = _models.SubProduct(provisioning_state=provisioning_state) if _product is not None: @@ -2184,7 +2169,7 @@ async def _put_sub_resource_initial( @distributed_trace_async async def begin_put_sub_resource( self, provisioning_state: Optional[str] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.SubProduct"]: + ) -> AsyncLROPoller[_models.SubProduct]: """Long running put request with sub resource. :param provisioning_state: Default value is None. @@ -2203,7 +2188,7 @@ async def begin_put_sub_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2214,7 +2199,6 @@ async def begin_put_sub_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("SubProduct", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2239,12 +2223,12 @@ def get_long_running_output(pipeline_response): async def _put_async_sub_resource_initial( self, provisioning_state: Optional[str] = None, **kwargs: Any - ) -> "_models.SubProduct": + ) -> _models.SubProduct: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] _product = _models.SubProduct(provisioning_state=provisioning_state) if _product is not None: @@ -2281,7 +2265,7 @@ async def _put_async_sub_resource_initial( @distributed_trace_async async def begin_put_async_sub_resource( self, provisioning_state: Optional[str] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.SubProduct"]: + ) -> AsyncLROPoller[_models.SubProduct]: """Long running put request with sub resource. :param provisioning_state: Default value is None. @@ -2300,7 +2284,7 @@ async def begin_put_async_sub_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2311,7 +2295,6 @@ async def begin_put_async_sub_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("SubProduct", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2334,11 +2317,11 @@ def get_long_running_output(pipeline_response): begin_put_async_sub_resource.metadata = {"url": "/lro/putsubresourceasync/202/200"} # type: ignore - async def _delete_provisioning202_accepted200_succeeded_initial(self, **kwargs: Any) -> "_models.Product": + async def _delete_provisioning202_accepted200_succeeded_initial(self, **kwargs: Any) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_accepted200_succeeded_request_initial( template_url=self._delete_provisioning202_accepted200_succeeded_initial.metadata["url"], @@ -2375,7 +2358,7 @@ async def _delete_provisioning202_accepted200_succeeded_initial(self, **kwargs: @distributed_trace_async async def begin_delete_provisioning202_accepted200_succeeded( self, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Long running delete request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Accepted’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -2393,7 +2376,7 @@ async def begin_delete_provisioning202_accepted200_succeeded( :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2404,7 +2387,6 @@ async def begin_delete_provisioning202_accepted200_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2427,11 +2409,11 @@ def get_long_running_output(pipeline_response): begin_delete_provisioning202_accepted200_succeeded.metadata = {"url": "/lro/delete/provisioning/202/accepted/200/succeeded"} # type: ignore - async def _delete_provisioning202_deleting_failed200_initial(self, **kwargs: Any) -> "_models.Product": + async def _delete_provisioning202_deleting_failed200_initial(self, **kwargs: Any) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_deleting_failed200_request_initial( template_url=self._delete_provisioning202_deleting_failed200_initial.metadata["url"], @@ -2466,7 +2448,7 @@ async def _delete_provisioning202_deleting_failed200_initial(self, **kwargs: Any _delete_provisioning202_deleting_failed200_initial.metadata = {"url": "/lro/delete/provisioning/202/deleting/200/failed"} # type: ignore @distributed_trace_async - async def begin_delete_provisioning202_deleting_failed200(self, **kwargs: Any) -> AsyncLROPoller["_models.Product"]: + async def begin_delete_provisioning202_deleting_failed200(self, **kwargs: Any) -> AsyncLROPoller[_models.Product]: """Long running delete request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Failed’. @@ -2484,7 +2466,7 @@ async def begin_delete_provisioning202_deleting_failed200(self, **kwargs: Any) - :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2495,7 +2477,6 @@ async def begin_delete_provisioning202_deleting_failed200(self, **kwargs: Any) - kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2518,11 +2499,11 @@ def get_long_running_output(pipeline_response): begin_delete_provisioning202_deleting_failed200.metadata = {"url": "/lro/delete/provisioning/202/deleting/200/failed"} # type: ignore - async def _delete_provisioning202_deletingcanceled200_initial(self, **kwargs: Any) -> "_models.Product": + async def _delete_provisioning202_deletingcanceled200_initial(self, **kwargs: Any) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_deletingcanceled200_request_initial( template_url=self._delete_provisioning202_deletingcanceled200_initial.metadata["url"], @@ -2557,9 +2538,7 @@ async def _delete_provisioning202_deletingcanceled200_initial(self, **kwargs: An _delete_provisioning202_deletingcanceled200_initial.metadata = {"url": "/lro/delete/provisioning/202/deleting/200/canceled"} # type: ignore @distributed_trace_async - async def begin_delete_provisioning202_deletingcanceled200( - self, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + async def begin_delete_provisioning202_deletingcanceled200(self, **kwargs: Any) -> AsyncLROPoller[_models.Product]: """Long running delete request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Canceled’. @@ -2577,7 +2556,7 @@ async def begin_delete_provisioning202_deletingcanceled200( :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2588,7 +2567,6 @@ async def begin_delete_provisioning202_deletingcanceled200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2686,11 +2664,11 @@ def get_long_running_output(pipeline_response): begin_delete204_succeeded.metadata = {"url": "/lro/delete/204/succeeded"} # type: ignore - async def _delete202_retry200_initial(self, **kwargs: Any) -> Optional["_models.Product"]: + async def _delete202_retry200_initial(self, **kwargs: Any) -> Optional[_models.Product]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] request = build_delete202_retry200_request_initial( template_url=self._delete202_retry200_initial.metadata["url"], @@ -2724,7 +2702,7 @@ async def _delete202_retry200_initial(self, **kwargs: Any) -> Optional["_models. _delete202_retry200_initial.metadata = {"url": "/lro/delete/202/retry/200"} # type: ignore @distributed_trace_async - async def begin_delete202_retry200(self, **kwargs: Any) -> AsyncLROPoller["_models.Product"]: + async def begin_delete202_retry200(self, **kwargs: Any) -> AsyncLROPoller[_models.Product]: """Long running delete request, service returns a 202 to the initial request. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -2741,7 +2719,7 @@ async def begin_delete202_retry200(self, **kwargs: Any) -> AsyncLROPoller["_mode :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2750,7 +2728,6 @@ async def begin_delete202_retry200(self, **kwargs: Any) -> AsyncLROPoller["_mode kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2773,11 +2750,11 @@ def get_long_running_output(pipeline_response): begin_delete202_retry200.metadata = {"url": "/lro/delete/202/retry/200"} # type: ignore - async def _delete202_no_retry204_initial(self, **kwargs: Any) -> Optional["_models.Product"]: + async def _delete202_no_retry204_initial(self, **kwargs: Any) -> Optional[_models.Product]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] request = build_delete202_no_retry204_request_initial( template_url=self._delete202_no_retry204_initial.metadata["url"], @@ -2811,7 +2788,7 @@ async def _delete202_no_retry204_initial(self, **kwargs: Any) -> Optional["_mode _delete202_no_retry204_initial.metadata = {"url": "/lro/delete/202/noretry/204"} # type: ignore @distributed_trace_async - async def begin_delete202_no_retry204(self, **kwargs: Any) -> AsyncLROPoller["_models.Product"]: + async def begin_delete202_no_retry204(self, **kwargs: Any) -> AsyncLROPoller[_models.Product]: """Long running delete request, service returns a 202 to the initial request. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -2828,7 +2805,7 @@ async def begin_delete202_no_retry204(self, **kwargs: Any) -> AsyncLROPoller["_m :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2837,7 +2814,6 @@ async def begin_delete202_no_retry204(self, **kwargs: Any) -> AsyncLROPoller["_m kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3358,11 +3334,11 @@ def get_long_running_output(pipeline_response): begin_delete_async_retrycanceled.metadata = {"url": "/lro/deleteasync/retry/canceled"} # type: ignore - async def _post200_with_payload_initial(self, **kwargs: Any) -> "_models.Sku": + async def _post200_with_payload_initial(self, **kwargs: Any) -> _models.Sku: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] request = build_post200_with_payload_request_initial( template_url=self._post200_with_payload_initial.metadata["url"], @@ -3393,7 +3369,7 @@ async def _post200_with_payload_initial(self, **kwargs: Any) -> "_models.Sku": _post200_with_payload_initial.metadata = {"url": "/lro/post/payload/200"} # type: ignore @distributed_trace_async - async def begin_post200_with_payload(self, **kwargs: Any) -> AsyncLROPoller["_models.Sku"]: + async def begin_post200_with_payload(self, **kwargs: Any) -> AsyncLROPoller[_models.Sku]: """Long running post request, service returns a 202 to the initial request, with 'Location' header. Poll returns a 200 with a response body after success. @@ -3409,7 +3385,7 @@ async def begin_post200_with_payload(self, **kwargs: Any) -> AsyncLROPoller["_mo :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Sku] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3418,7 +3394,6 @@ async def begin_post200_with_payload(self, **kwargs: Any) -> AsyncLROPoller["_mo kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Sku", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3442,7 +3417,7 @@ def get_long_running_output(pipeline_response): begin_post200_with_payload.metadata = {"url": "/lro/post/payload/200"} # type: ignore async def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -3483,7 +3458,7 @@ async def _post202_retry200_initial( # pylint: disable=inconsistent-return-stat @distributed_trace_async async def begin_post202_retry200( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, with 'Location' and 'Retry-After' headers, Polls return a 200 with a response body after success. @@ -3535,13 +3510,13 @@ def get_long_running_output(pipeline_response): begin_post202_retry200.metadata = {"url": "/lro/post/202/retry/200"} # type: ignore async def _post202_no_retry204_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -3580,8 +3555,8 @@ async def _post202_no_retry204_initial( @distributed_trace_async async def begin_post202_no_retry204( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running post request, service returns a 202 to the initial request, with 'Location' header, 204 with noresponse body after success. @@ -3601,7 +3576,7 @@ async def begin_post202_no_retry204( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3639,11 +3614,11 @@ def get_long_running_output(pipeline_response): begin_post202_no_retry204.metadata = {"url": "/lro/post/202/noretry/204"} # type: ignore - async def _post_double_headers_final_location_get_initial(self, **kwargs: Any) -> "_models.Product": + async def _post_double_headers_final_location_get_initial(self, **kwargs: Any) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_post_double_headers_final_location_get_request_initial( template_url=self._post_double_headers_final_location_get_initial.metadata["url"], @@ -3670,7 +3645,7 @@ async def _post_double_headers_final_location_get_initial(self, **kwargs: Any) - _post_double_headers_final_location_get_initial.metadata = {"url": "/lro/LROPostDoubleHeadersFinalLocationGet"} # type: ignore @distributed_trace_async - async def begin_post_double_headers_final_location_get(self, **kwargs: Any) -> AsyncLROPoller["_models.Product"]: + async def begin_post_double_headers_final_location_get(self, **kwargs: Any) -> AsyncLROPoller[_models.Product]: """Long running post request, service returns a 202 to the initial request with both Location and Azure-Async header. Poll Azure-Async and it's success. Should poll Location to get the final object. @@ -3688,7 +3663,7 @@ async def begin_post_double_headers_final_location_get(self, **kwargs: Any) -> A :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3699,7 +3674,6 @@ async def begin_post_double_headers_final_location_get(self, **kwargs: Any) -> A kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3724,11 +3698,11 @@ def get_long_running_output(pipeline_response): begin_post_double_headers_final_location_get.metadata = {"url": "/lro/LROPostDoubleHeadersFinalLocationGet"} # type: ignore - async def _post_double_headers_final_azure_header_get_initial(self, **kwargs: Any) -> "_models.Product": + async def _post_double_headers_final_azure_header_get_initial(self, **kwargs: Any) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_post_double_headers_final_azure_header_get_request_initial( template_url=self._post_double_headers_final_azure_header_get_initial.metadata["url"], @@ -3755,9 +3729,7 @@ async def _post_double_headers_final_azure_header_get_initial(self, **kwargs: An _post_double_headers_final_azure_header_get_initial.metadata = {"url": "/lro/LROPostDoubleHeadersFinalAzureHeaderGet"} # type: ignore @distributed_trace_async - async def begin_post_double_headers_final_azure_header_get( - self, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + async def begin_post_double_headers_final_azure_header_get(self, **kwargs: Any) -> AsyncLROPoller[_models.Product]: """Long running post request, service returns a 202 to the initial request with both Location and Azure-Async header. Poll Azure-Async and it's success. Should NOT poll Location to get the final object. @@ -3775,7 +3747,7 @@ async def begin_post_double_headers_final_azure_header_get( :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3786,7 +3758,6 @@ async def begin_post_double_headers_final_azure_header_get( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3812,11 +3783,11 @@ def get_long_running_output(pipeline_response): begin_post_double_headers_final_azure_header_get.metadata = {"url": "/lro/LROPostDoubleHeadersFinalAzureHeaderGet"} # type: ignore - async def _post_double_headers_final_azure_header_get_default_initial(self, **kwargs: Any) -> "_models.Product": + async def _post_double_headers_final_azure_header_get_default_initial(self, **kwargs: Any) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_post_double_headers_final_azure_header_get_default_request_initial( template_url=self._post_double_headers_final_azure_header_get_default_initial.metadata["url"], @@ -3845,7 +3816,7 @@ async def _post_double_headers_final_azure_header_get_default_initial(self, **kw @distributed_trace_async async def begin_post_double_headers_final_azure_header_get_default( self, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Long running post request, service returns a 202 to the initial request with both Location and Azure-Async header. Poll Azure-Async and it's success. Should NOT poll Location to get the final object if you support initial Autorest behavior. @@ -3863,7 +3834,7 @@ async def begin_post_double_headers_final_azure_header_get_default( :rtype: ~azure.core.polling.AsyncLROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3874,7 +3845,6 @@ async def begin_post_double_headers_final_azure_header_get_default( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3898,13 +3868,13 @@ def get_long_running_output(pipeline_response): begin_post_double_headers_final_azure_header_get_default.metadata = {"url": "/lro/LROPostDoubleHeadersFinalAzureHeaderGetDefault"} # type: ignore async def _post_async_retry_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> Optional[_models.Product]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -3949,8 +3919,8 @@ async def _post_async_retry_succeeded_initial( @distributed_trace_async async def begin_post_async_retry_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -3971,7 +3941,7 @@ async def begin_post_async_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3982,7 +3952,6 @@ async def begin_post_async_retry_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -4006,13 +3975,13 @@ def get_long_running_output(pipeline_response): begin_post_async_retry_succeeded.metadata = {"url": "/lro/postasync/retry/succeeded"} # type: ignore async def _post_async_no_retry_succeeded_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> Optional[_models.Product]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -4057,8 +4026,8 @@ async def _post_async_no_retry_succeeded_initial( @distributed_trace_async async def begin_post_async_no_retry_succeeded( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -4079,7 +4048,7 @@ async def begin_post_async_no_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -4090,7 +4059,6 @@ async def begin_post_async_no_retry_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -4114,7 +4082,7 @@ def get_long_running_output(pipeline_response): begin_post_async_no_retry_succeeded.metadata = {"url": "/lro/postasync/noretry/succeeded"} # type: ignore async def _post_async_retry_failed_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -4158,7 +4126,7 @@ async def _post_async_retry_failed_initial( # pylint: disable=inconsistent-retu @distributed_trace_async async def begin_post_async_retry_failed( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation @@ -4211,7 +4179,7 @@ def get_long_running_output(pipeline_response): begin_post_async_retry_failed.metadata = {"url": "/lro/postasync/retry/failed"} # type: ignore async def _post_async_retrycanceled_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -4255,7 +4223,7 @@ async def _post_async_retrycanceled_initial( # pylint: disable=inconsistent-ret @distributed_trace_async async def begin_post_async_retrycanceled( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py index 6d324839d3d..aa7e41ce771 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py @@ -78,13 +78,13 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") async def _put_non_retry400_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -123,8 +123,8 @@ async def _put_non_retry400_initial( @distributed_trace_async async def begin_put_non_retry400( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 400 to the initial request. :param product: Product to put. Default value is None. @@ -143,7 +143,7 @@ async def begin_put_non_retry400( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -154,7 +154,6 @@ async def begin_put_non_retry400( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -178,13 +177,13 @@ def get_long_running_output(pipeline_response): begin_put_non_retry400.metadata = {"url": "/lro/nonretryerror/put/400"} # type: ignore async def _put_non_retry201_creating400_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -223,8 +222,8 @@ async def _put_non_retry201_creating400_initial( @distributed_trace_async async def begin_put_non_retry201_creating400( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code. @@ -244,7 +243,7 @@ async def begin_put_non_retry201_creating400( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -255,7 +254,6 @@ async def begin_put_non_retry201_creating400( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -279,13 +277,13 @@ def get_long_running_output(pipeline_response): begin_put_non_retry201_creating400.metadata = {"url": "/lro/nonretryerror/put/201/creating/400"} # type: ignore async def _put_non_retry201_creating400_invalid_json_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -324,8 +322,8 @@ async def _put_non_retry201_creating400_invalid_json_initial( @distributed_trace_async async def begin_put_non_retry201_creating400_invalid_json( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code. @@ -345,7 +343,7 @@ async def begin_put_non_retry201_creating400_invalid_json( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -356,7 +354,6 @@ async def begin_put_non_retry201_creating400_invalid_json( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -380,13 +377,13 @@ def get_long_running_output(pipeline_response): begin_put_non_retry201_creating400_invalid_json.metadata = {"url": "/lro/nonretryerror/put/201/creating/400/invalidjson"} # type: ignore async def _put_async_relative_retry400_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -428,8 +425,8 @@ async def _put_async_relative_retry400_initial( @distributed_trace_async async def begin_put_async_relative_retry400( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 with ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -449,7 +446,7 @@ async def begin_put_async_relative_retry400( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -734,7 +731,7 @@ def get_long_running_output(pipeline_response): begin_delete_async_relative_retry400.metadata = {"url": "/lro/nonretryerror/deleteasync/retry/400"} # type: ignore async def _post_non_retry400_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -775,7 +772,7 @@ async def _post_non_retry400_initial( # pylint: disable=inconsistent-return-sta @distributed_trace_async async def begin_post_non_retry400( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 400 with no error body. @@ -826,7 +823,7 @@ def get_long_running_output(pipeline_response): begin_post_non_retry400.metadata = {"url": "/lro/nonretryerror/post/400"} # type: ignore async def _post202_non_retry400_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -867,7 +864,7 @@ async def _post202_non_retry400_initial( # pylint: disable=inconsistent-return- @distributed_trace_async async def begin_post202_non_retry400( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 with a location header. @@ -918,7 +915,7 @@ def get_long_running_output(pipeline_response): begin_post202_non_retry400.metadata = {"url": "/lro/nonretryerror/post/202/retry/400"} # type: ignore async def _post_async_relative_retry400_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -962,7 +959,7 @@ async def _post_async_relative_retry400_initial( # pylint: disable=inconsistent @distributed_trace_async async def begin_post_async_relative_retry400( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1014,13 +1011,13 @@ def get_long_running_output(pipeline_response): begin_post_async_relative_retry400.metadata = {"url": "/lro/nonretryerror/postasync/retry/400"} # type: ignore async def _put_error201_no_provisioning_state_payload_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1059,8 +1056,8 @@ async def _put_error201_no_provisioning_state_payload_initial( @distributed_trace_async async def begin_put_error201_no_provisioning_state_payload( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 201 to the initial request with no payload. :param product: Product to put. Default value is None. @@ -1079,7 +1076,7 @@ async def begin_put_error201_no_provisioning_state_payload( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1090,7 +1087,6 @@ async def begin_put_error201_no_provisioning_state_payload( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1114,13 +1110,13 @@ def get_long_running_output(pipeline_response): begin_put_error201_no_provisioning_state_payload.metadata = {"url": "/lro/error/put/201/noprovisioningstatepayload"} # type: ignore async def _put_async_relative_retry_no_status_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1162,8 +1158,8 @@ async def _put_async_relative_retry_no_status_initial( @distributed_trace_async async def begin_put_async_relative_retry_no_status( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1184,7 +1180,7 @@ async def begin_put_async_relative_retry_no_status( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1226,13 +1222,13 @@ def get_long_running_output(pipeline_response): begin_put_async_relative_retry_no_status.metadata = {"url": "/lro/error/putasync/retry/nostatus"} # type: ignore async def _put_async_relative_retry_no_status_payload_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1274,8 +1270,8 @@ async def _put_async_relative_retry_no_status_payload_initial( @distributed_trace_async async def begin_put_async_relative_retry_no_status_payload( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1296,7 +1292,7 @@ async def begin_put_async_relative_retry_no_status_payload( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1498,7 +1494,7 @@ def get_long_running_output(pipeline_response): begin_delete_async_relative_retry_no_status.metadata = {"url": "/lro/error/deleteasync/retry/nostatus"} # type: ignore async def _post202_no_location_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1539,7 +1535,7 @@ async def _post202_no_location_initial( # pylint: disable=inconsistent-return-s @distributed_trace_async async def begin_post202_no_location( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, without a location header. @@ -1591,7 +1587,7 @@ def get_long_running_output(pipeline_response): begin_post202_no_location.metadata = {"url": "/lro/error/post/202/nolocation"} # type: ignore async def _post_async_relative_retry_no_payload_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1635,7 +1631,7 @@ async def _post_async_relative_retry_no_payload_initial( # pylint: disable=inco @distributed_trace_async async def begin_post_async_relative_retry_no_payload( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation @@ -1688,13 +1684,13 @@ def get_long_running_output(pipeline_response): begin_post_async_relative_retry_no_payload.metadata = {"url": "/lro/error/postasync/retry/nopayload"} # type: ignore async def _put200_invalid_json_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> Optional[_models.Product]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -1731,8 +1727,8 @@ async def _put200_invalid_json_initial( @distributed_trace_async async def begin_put200_invalid_json( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that is not a valid json. @@ -1752,7 +1748,7 @@ async def begin_put200_invalid_json( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1763,7 +1759,6 @@ async def begin_put200_invalid_json( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1787,13 +1782,13 @@ def get_long_running_output(pipeline_response): begin_put200_invalid_json.metadata = {"url": "/lro/error/put/200/invalidjson"} # type: ignore async def _put_async_relative_retry_invalid_header_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1835,8 +1830,8 @@ async def _put_async_relative_retry_invalid_header_initial( @distributed_trace_async async def begin_put_async_relative_retry_invalid_header( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. The endpoint indicated in the Azure-AsyncOperation header is invalid. @@ -1857,7 +1852,7 @@ async def begin_put_async_relative_retry_invalid_header( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1899,13 +1894,13 @@ def get_long_running_output(pipeline_response): begin_put_async_relative_retry_invalid_header.metadata = {"url": "/lro/error/putasync/retry/invalidheader"} # type: ignore async def _put_async_relative_retry_invalid_json_polling_initial( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1947,8 +1942,8 @@ async def _put_async_relative_retry_invalid_json_polling_initial( @distributed_trace_async async def begin_put_async_relative_retry_invalid_json_polling( - self, product: Optional["_models.Product"] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + self, product: Optional[_models.Product] = None, **kwargs: Any + ) -> AsyncLROPoller[_models.Product]: """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1969,7 +1964,7 @@ async def begin_put_async_relative_retry_invalid_json_polling( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2263,7 +2258,7 @@ def get_long_running_output(pipeline_response): begin_delete_async_relative_retry_invalid_json_polling.metadata = {"url": "/lro/error/deleteasync/retry/invalidjsonpolling"} # type: ignore async def _post202_retry_invalid_header_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -2304,7 +2299,7 @@ async def _post202_retry_invalid_header_initial( # pylint: disable=inconsistent @distributed_trace_async async def begin_post202_retry_invalid_header( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, with invalid 'Location' and 'Retry-After' headers. @@ -2356,7 +2351,7 @@ def get_long_running_output(pipeline_response): begin_post202_retry_invalid_header.metadata = {"url": "/lro/error/post/202/retry/invalidheader"} # type: ignore async def _post_async_relative_retry_invalid_header_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -2400,7 +2395,7 @@ async def _post_async_relative_retry_invalid_header_initial( # pylint: disable= @distributed_trace_async async def begin_post_async_relative_retry_invalid_header( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. The endpoint indicated in the Azure-AsyncOperation @@ -2453,7 +2448,7 @@ def get_long_running_output(pipeline_response): begin_post_async_relative_retry_invalid_header.metadata = {"url": "/lro/error/postasync/retry/invalidheader"} # type: ignore async def _post_async_relative_retry_invalid_json_polling_initial( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> None: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -2497,7 +2492,7 @@ async def _post_async_relative_retry_invalid_json_polling_initial( # pylint: di @distributed_trace_async async def begin_post_async_relative_retry_invalid_json_polling( # pylint: disable=inconsistent-return-statements - self, product: Optional["_models.Product"] = None, **kwargs: Any + self, product: Optional[_models.Product] = None, **kwargs: Any ) -> AsyncLROPoller[None]: """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_auto_rest_long_running_operation_test_service_enums.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_auto_rest_long_running_operation_test_service_enums.py index 8ee3ca2c5f4..7245056baf5 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_auto_rest_long_running_operation_test_service_enums.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_auto_rest_long_running_operation_test_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class OperationResultStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class OperationResultStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The status of the request""" SUCCEEDED = "Succeeded" @@ -27,7 +26,7 @@ class OperationResultStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): OK = "OK" -class ProductPropertiesProvisioningStateValues(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ProductPropertiesProvisioningStateValues(str, Enum, metaclass=CaseInsensitiveEnumMeta): SUCCEEDED = "Succeeded" FAILED = "Failed" @@ -42,7 +41,7 @@ class ProductPropertiesProvisioningStateValues(with_metaclass(CaseInsensitiveEnu OK = "OK" -class SubProductPropertiesProvisioningStateValues(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class SubProductPropertiesProvisioningStateValues(str, Enum, metaclass=CaseInsensitiveEnumMeta): SUCCEEDED = "Succeeded" FAILED = "Failed" diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py index 95ab9d1f533..5aa246ec2b6 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py @@ -10,8 +10,6 @@ import msrest.serialization -from ._auto_rest_long_running_operation_test_service_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py index 2541b11ce07..8be023972e4 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py @@ -156,15 +156,15 @@ def __init__(self, *args, **kwargs): def _put_async_retry_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -207,10 +207,10 @@ def _put_async_retry_succeeded_initial( @distributed_trace def begin_put_async_retry_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 is required message header for all requests. Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the @@ -231,7 +231,7 @@ def begin_put_async_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -274,15 +274,15 @@ def get_long_running_output(pipeline_response): def _put201_creating_succeeded200_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -322,10 +322,10 @@ def _put201_creating_succeeded200_initial( @distributed_trace def begin_put201_creating_succeeded200( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """x-ms-client-request-id = 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0 is required message header for all requests. Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll @@ -346,7 +346,7 @@ def begin_put201_creating_succeeded200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -357,7 +357,6 @@ def begin_put201_creating_succeeded200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -382,7 +381,7 @@ def get_long_running_output(pipeline_response): def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -426,7 +425,7 @@ def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements @distributed_trace def begin_post202_retry200( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -482,7 +481,7 @@ def get_long_running_output(pipeline_response): def _post_async_retry_succeeded_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -529,7 +528,7 @@ def _post_async_retry_succeeded_initial( # pylint: disable=inconsistent-return- @distributed_trace def begin_post_async_retry_succeeded( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py index fbe7d43dc18..82746b2d83b 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py @@ -216,15 +216,15 @@ def __init__(self, *args, **kwargs): def _put201_creating_succeeded200_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -264,10 +264,10 @@ def _put201_creating_succeeded200_initial( @distributed_trace def begin_put201_creating_succeeded200( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 500, then a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -287,7 +287,7 @@ def begin_put201_creating_succeeded200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -298,7 +298,6 @@ def begin_put201_creating_succeeded200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -323,15 +322,15 @@ def get_long_running_output(pipeline_response): def _put_async_relative_retry_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -374,10 +373,10 @@ def _put_async_relative_retry_succeeded_initial( @distributed_trace def begin_put_async_relative_retry_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 500, then a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -397,7 +396,7 @@ def begin_put_async_relative_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -441,11 +440,11 @@ def get_long_running_output(pipeline_response): def _delete_provisioning202_accepted200_succeeded_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_accepted200_succeeded_request_initial( template_url=self._delete_provisioning202_accepted200_succeeded_initial.metadata["url"], @@ -483,7 +482,7 @@ def _delete_provisioning202_accepted200_succeeded_initial( def begin_delete_provisioning202_accepted200_succeeded( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running delete request, service returns a 500, then a 202 to the initial request, with an entity that contains ProvisioningState=’Accepted’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -500,7 +499,7 @@ def begin_delete_provisioning202_accepted200_succeeded( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -511,7 +510,6 @@ def begin_delete_provisioning202_accepted200_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -705,7 +703,7 @@ def get_long_running_output(pipeline_response): def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -749,7 +747,7 @@ def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements @distributed_trace def begin_post202_retry200( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -804,7 +802,7 @@ def get_long_running_output(pipeline_response): def _post_async_relative_retry_succeeded_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -851,7 +849,7 @@ def _post_async_relative_retry_succeeded_initial( # pylint: disable=inconsisten @distributed_trace def begin_post_async_relative_retry_succeeded( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py index 504cc5e82cb..3f3751675b7 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py @@ -1048,15 +1048,15 @@ def __init__(self, *args, **kwargs): def _put200_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -1094,10 +1094,10 @@ def _put200_succeeded_initial( @distributed_trace def begin_put200_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Succeeded’. @@ -1116,7 +1116,7 @@ def begin_put200_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1127,7 +1127,6 @@ def begin_put200_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1152,15 +1151,15 @@ def get_long_running_output(pipeline_response): def _patch200_succeeded_ignore_headers_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1201,10 +1200,10 @@ def _patch200_succeeded_ignore_headers_initial( @distributed_trace def begin_patch200_succeeded_ignore_headers( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request with location header. We should not have any subsequent calls after receiving this first response. @@ -1223,7 +1222,7 @@ def begin_patch200_succeeded_ignore_headers( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1264,15 +1263,15 @@ def get_long_running_output(pipeline_response): def _patch201_retry_with_async_header_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1317,10 +1316,10 @@ def _patch201_retry_with_async_header_initial( @distributed_trace def begin_patch201_retry_with_async_header( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running patch request, service returns a 201 to the initial request with async header. :param product: Product to patch. Default value is None. @@ -1338,7 +1337,7 @@ def begin_patch201_retry_with_async_header( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1349,7 +1348,6 @@ def begin_patch201_retry_with_async_header( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1376,15 +1374,15 @@ def get_long_running_output(pipeline_response): def _patch202_retry_with_async_and_location_header_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1430,10 +1428,10 @@ def _patch202_retry_with_async_and_location_header_initial( @distributed_trace def begin_patch202_retry_with_async_and_location_header( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running patch request, service returns a 202 to the initial request with async and location header. @@ -1452,7 +1450,7 @@ def begin_patch202_retry_with_async_and_location_header( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1463,7 +1461,6 @@ def begin_patch202_retry_with_async_and_location_header( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1488,15 +1485,15 @@ def get_long_running_output(pipeline_response): def _put201_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1532,10 +1529,10 @@ def _put201_succeeded_initial( @distributed_trace def begin_put201_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Succeeded’. @@ -1554,7 +1551,7 @@ def begin_put201_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1565,7 +1562,6 @@ def begin_put201_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1591,11 +1587,11 @@ def get_long_running_output(pipeline_response): def _post202_list_initial( self, **kwargs # type: Any ): - # type: (...) -> Optional[List["_models.Product"]] + # type: (...) -> Optional[List[_models.Product]] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional[List["_models.Product"]]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[List[_models.Product]]] request = build_post202_list_request_initial( template_url=self._post202_list_initial.metadata["url"], @@ -1634,7 +1630,7 @@ def _post202_list_initial( def begin_post202_list( self, **kwargs # type: Any ): - # type: (...) -> LROPoller[List["_models.Product"]] + # type: (...) -> 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' }]. @@ -1651,7 +1647,7 @@ def begin_post202_list( :rtype: ~azure.core.polling.LROPoller[list[~lro.models.Product]] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1660,7 +1656,6 @@ def begin_post202_list( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("[Product]", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1685,15 +1680,15 @@ def get_long_running_output(pipeline_response): def _put200_succeeded_no_state_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1729,10 +1724,10 @@ def _put200_succeeded_no_state_initial( @distributed_trace def begin_put200_succeeded_no_state( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that does not contain ProvisioningState=’Succeeded’. @@ -1751,7 +1746,7 @@ def begin_put200_succeeded_no_state( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1762,7 +1757,6 @@ def begin_put200_succeeded_no_state( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1787,15 +1781,15 @@ def get_long_running_output(pipeline_response): def _put202_retry200_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1831,10 +1825,10 @@ def _put202_retry200_initial( @distributed_trace def begin_put202_retry200( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 202 to the initial request, with a location header that points to a polling URL that returns a 200 and an entity that doesn't contains ProvisioningState. @@ -1854,7 +1848,7 @@ def begin_put202_retry200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1865,7 +1859,6 @@ def begin_put202_retry200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1890,15 +1883,15 @@ def get_long_running_output(pipeline_response): def _put201_creating_succeeded200_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1938,10 +1931,10 @@ def _put201_creating_succeeded200_initial( @distributed_trace def begin_put201_creating_succeeded200( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -1961,7 +1954,7 @@ def begin_put201_creating_succeeded200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1972,7 +1965,6 @@ def begin_put201_creating_succeeded200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1997,15 +1989,15 @@ def get_long_running_output(pipeline_response): def _put200_updating_succeeded204_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2041,10 +2033,10 @@ def _put200_updating_succeeded204_initial( @distributed_trace def begin_put200_updating_succeeded204( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Updating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -2064,7 +2056,7 @@ def begin_put200_updating_succeeded204( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2075,7 +2067,6 @@ def begin_put200_updating_succeeded204( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2100,15 +2091,15 @@ def get_long_running_output(pipeline_response): def _put201_creating_failed200_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2148,10 +2139,10 @@ def _put201_creating_failed200_initial( @distributed_trace def begin_put201_creating_failed200( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Created’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Failed’. @@ -2171,7 +2162,7 @@ def begin_put201_creating_failed200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2182,7 +2173,6 @@ def begin_put201_creating_failed200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2207,15 +2197,15 @@ def get_long_running_output(pipeline_response): def _put200_acceptedcanceled200_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2251,10 +2241,10 @@ def _put200_acceptedcanceled200_initial( @distributed_trace def begin_put200_acceptedcanceled200( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 201 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Canceled’. @@ -2274,7 +2264,7 @@ def begin_put200_acceptedcanceled200( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2285,7 +2275,6 @@ def begin_put200_acceptedcanceled200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2310,15 +2299,15 @@ def get_long_running_output(pipeline_response): def _put_no_header_in_retry_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2357,10 +2346,10 @@ def _put_no_header_in_retry_initial( @distributed_trace def begin_put_no_header_in_retry( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 202 to the initial request with location header. Subsequent calls to operation status do not contain location header. @@ -2379,7 +2368,7 @@ def begin_put_no_header_in_retry( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2418,15 +2407,15 @@ def get_long_running_output(pipeline_response): def _put_async_retry_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2469,10 +2458,10 @@ def _put_async_retry_succeeded_initial( @distributed_trace def begin_put_async_retry_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -2492,7 +2481,7 @@ def begin_put_async_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2535,15 +2524,15 @@ def get_long_running_output(pipeline_response): def _put_async_no_retry_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2585,10 +2574,10 @@ def _put_async_no_retry_succeeded_initial( @distributed_trace def begin_put_async_no_retry_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -2608,7 +2597,7 @@ def begin_put_async_no_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2650,15 +2639,15 @@ def get_long_running_output(pipeline_response): def _put_async_retry_failed_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2701,10 +2690,10 @@ def _put_async_retry_failed_initial( @distributed_trace def begin_put_async_retry_failed( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -2724,7 +2713,7 @@ def begin_put_async_retry_failed( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2767,15 +2756,15 @@ def get_long_running_output(pipeline_response): def _put_async_no_retrycanceled_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2817,10 +2806,10 @@ def _put_async_no_retrycanceled_initial( @distributed_trace def begin_put_async_no_retrycanceled( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -2840,7 +2829,7 @@ def begin_put_async_no_retrycanceled( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2882,15 +2871,15 @@ def get_long_running_output(pipeline_response): def _put_async_no_header_in_retry_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2931,10 +2920,10 @@ def _put_async_no_header_in_retry_initial( @distributed_trace def begin_put_async_no_header_in_retry( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 202 to the initial request with Azure-AsyncOperation header. Subsequent calls to operation status do not contain Azure-AsyncOperation header. @@ -2954,7 +2943,7 @@ def begin_put_async_no_header_in_retry( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2995,15 +2984,15 @@ def get_long_running_output(pipeline_response): def _put_non_resource_initial( self, - sku=None, # type: Optional["_models.Sku"] + sku=None, # type: Optional[_models.Sku] **kwargs # type: Any ): - # type: (...) -> "_models.Sku" + # type: (...) -> _models.Sku error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] if sku is not None: _json = self._serialize.body(sku, "Sku") @@ -3039,10 +3028,10 @@ def _put_non_resource_initial( @distributed_trace def begin_put_non_resource( self, - sku=None, # type: Optional["_models.Sku"] + sku=None, # type: Optional[_models.Sku] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Sku"] + # type: (...) -> LROPoller[_models.Sku] """Long running put request with non resource. :param sku: sku to put. Default value is None. @@ -3060,7 +3049,7 @@ def begin_put_non_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3071,7 +3060,6 @@ def begin_put_non_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Sku", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3096,15 +3084,15 @@ def get_long_running_output(pipeline_response): def _put_async_non_resource_initial( self, - sku=None, # type: Optional["_models.Sku"] + sku=None, # type: Optional[_models.Sku] **kwargs # type: Any ): - # type: (...) -> "_models.Sku" + # type: (...) -> _models.Sku error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] if sku is not None: _json = self._serialize.body(sku, "Sku") @@ -3140,10 +3128,10 @@ def _put_async_non_resource_initial( @distributed_trace def begin_put_async_non_resource( self, - sku=None, # type: Optional["_models.Sku"] + sku=None, # type: Optional[_models.Sku] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Sku"] + # type: (...) -> LROPoller[_models.Sku] """Long running put request with non resource. :param sku: Sku to put. Default value is None. @@ -3161,7 +3149,7 @@ def begin_put_async_non_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3172,7 +3160,6 @@ def begin_put_async_non_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Sku", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3200,12 +3187,12 @@ def _put_sub_resource_initial( provisioning_state=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.SubProduct" + # type: (...) -> _models.SubProduct error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] _product = _models.SubProduct(provisioning_state=provisioning_state) if _product is not None: @@ -3245,7 +3232,7 @@ def begin_put_sub_resource( provisioning_state=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.SubProduct"] + # type: (...) -> LROPoller[_models.SubProduct] """Long running put request with sub resource. :param provisioning_state: Default value is None. @@ -3263,7 +3250,7 @@ def begin_put_sub_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3274,7 +3261,6 @@ def begin_put_sub_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("SubProduct", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3302,12 +3288,12 @@ def _put_async_sub_resource_initial( provisioning_state=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.SubProduct" + # type: (...) -> _models.SubProduct error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] _product = _models.SubProduct(provisioning_state=provisioning_state) if _product is not None: @@ -3347,7 +3333,7 @@ def begin_put_async_sub_resource( provisioning_state=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.SubProduct"] + # type: (...) -> LROPoller[_models.SubProduct] """Long running put request with sub resource. :param provisioning_state: Default value is None. @@ -3365,7 +3351,7 @@ def begin_put_async_sub_resource( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SubProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SubProduct] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3376,7 +3362,6 @@ def begin_put_async_sub_resource( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("SubProduct", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3402,11 +3387,11 @@ def get_long_running_output(pipeline_response): def _delete_provisioning202_accepted200_succeeded_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_accepted200_succeeded_request_initial( template_url=self._delete_provisioning202_accepted200_succeeded_initial.metadata["url"], @@ -3444,7 +3429,7 @@ def _delete_provisioning202_accepted200_succeeded_initial( def begin_delete_provisioning202_accepted200_succeeded( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running delete request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Accepted’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -3461,7 +3446,7 @@ def begin_delete_provisioning202_accepted200_succeeded( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3472,7 +3457,6 @@ def begin_delete_provisioning202_accepted200_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3498,11 +3482,11 @@ def get_long_running_output(pipeline_response): def _delete_provisioning202_deleting_failed200_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_deleting_failed200_request_initial( template_url=self._delete_provisioning202_deleting_failed200_initial.metadata["url"], @@ -3540,7 +3524,7 @@ def _delete_provisioning202_deleting_failed200_initial( def begin_delete_provisioning202_deleting_failed200( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running delete request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Failed’. @@ -3557,7 +3541,7 @@ def begin_delete_provisioning202_deleting_failed200( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3568,7 +3552,6 @@ def begin_delete_provisioning202_deleting_failed200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3594,11 +3577,11 @@ def get_long_running_output(pipeline_response): def _delete_provisioning202_deletingcanceled200_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_delete_provisioning202_deletingcanceled200_request_initial( template_url=self._delete_provisioning202_deletingcanceled200_initial.metadata["url"], @@ -3636,7 +3619,7 @@ def _delete_provisioning202_deletingcanceled200_initial( def begin_delete_provisioning202_deletingcanceled200( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running delete request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Canceled’. @@ -3653,7 +3636,7 @@ def begin_delete_provisioning202_deletingcanceled200( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3664,7 +3647,6 @@ def begin_delete_provisioning202_deletingcanceled200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3767,11 +3749,11 @@ def get_long_running_output(pipeline_response): def _delete202_retry200_initial( self, **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] request = build_delete202_retry200_request_initial( template_url=self._delete202_retry200_initial.metadata["url"], @@ -3808,7 +3790,7 @@ def _delete202_retry200_initial( def begin_delete202_retry200( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running delete request, service returns a 202 to the initial request. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -3824,7 +3806,7 @@ def begin_delete202_retry200( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3833,7 +3815,6 @@ def begin_delete202_retry200( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -3859,11 +3840,11 @@ def get_long_running_output(pipeline_response): def _delete202_no_retry204_initial( self, **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] request = build_delete202_no_retry204_request_initial( template_url=self._delete202_no_retry204_initial.metadata["url"], @@ -3900,7 +3881,7 @@ def _delete202_no_retry204_initial( def begin_delete202_no_retry204( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running delete request, service returns a 202 to the initial request. Polls return this value until the last poll returns a ‘200’ with ProvisioningState=’Succeeded’. @@ -3916,7 +3897,7 @@ def begin_delete202_no_retry204( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -3925,7 +3906,6 @@ def begin_delete202_no_retry204( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -4455,11 +4435,11 @@ def get_long_running_output(pipeline_response): def _post200_with_payload_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Sku" + # type: (...) -> _models.Sku error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] request = build_post200_with_payload_request_initial( template_url=self._post200_with_payload_initial.metadata["url"], @@ -4493,7 +4473,7 @@ def _post200_with_payload_initial( def begin_post200_with_payload( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Sku"] + # type: (...) -> LROPoller[_models.Sku] """Long running post request, service returns a 202 to the initial request, with 'Location' header. Poll returns a 200 with a response body after success. @@ -4509,7 +4489,7 @@ def begin_post200_with_payload( :rtype: ~azure.core.polling.LROPoller[~lro.models.Sku] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Sku"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Sku] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -4518,7 +4498,6 @@ def begin_post200_with_payload( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Sku", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -4543,7 +4522,7 @@ def get_long_running_output(pipeline_response): def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -4587,7 +4566,7 @@ def _post202_retry200_initial( # pylint: disable=inconsistent-return-statements @distributed_trace def begin_post202_retry200( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -4642,15 +4621,15 @@ def get_long_running_output(pipeline_response): def _post202_no_retry204_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -4690,10 +4669,10 @@ def _post202_no_retry204_initial( @distributed_trace def begin_post202_no_retry204( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running post request, service returns a 202 to the initial request, with 'Location' header, 204 with noresponse body after success. @@ -4712,7 +4691,7 @@ def begin_post202_no_retry204( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -4753,11 +4732,11 @@ def get_long_running_output(pipeline_response): def _post_double_headers_final_location_get_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_post_double_headers_final_location_get_request_initial( template_url=self._post_double_headers_final_location_get_initial.metadata["url"], @@ -4787,7 +4766,7 @@ def _post_double_headers_final_location_get_initial( def begin_post_double_headers_final_location_get( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running post request, service returns a 202 to the initial request with both Location and Azure-Async header. Poll Azure-Async and it's success. Should poll Location to get the final object. @@ -4804,7 +4783,7 @@ def begin_post_double_headers_final_location_get( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -4815,7 +4794,6 @@ def begin_post_double_headers_final_location_get( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -4843,11 +4821,11 @@ def get_long_running_output(pipeline_response): def _post_double_headers_final_azure_header_get_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_post_double_headers_final_azure_header_get_request_initial( template_url=self._post_double_headers_final_azure_header_get_initial.metadata["url"], @@ -4877,7 +4855,7 @@ def _post_double_headers_final_azure_header_get_initial( def begin_post_double_headers_final_azure_header_get( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running post request, service returns a 202 to the initial request with both Location and Azure-Async header. Poll Azure-Async and it's success. Should NOT poll Location to get the final object. @@ -4894,7 +4872,7 @@ def begin_post_double_headers_final_azure_header_get( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -4905,7 +4883,6 @@ def begin_post_double_headers_final_azure_header_get( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -4933,11 +4910,11 @@ def get_long_running_output(pipeline_response): def _post_double_headers_final_azure_header_get_default_initial( self, **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_post_double_headers_final_azure_header_get_default_request_initial( template_url=self._post_double_headers_final_azure_header_get_default_initial.metadata["url"], @@ -4967,7 +4944,7 @@ def _post_double_headers_final_azure_header_get_default_initial( def begin_post_double_headers_final_azure_header_get_default( self, **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running post request, service returns a 202 to the initial request with both Location and Azure-Async header. Poll Azure-Async and it's success. Should NOT poll Location to get the final object if you support initial Autorest behavior. @@ -4984,7 +4961,7 @@ def begin_post_double_headers_final_azure_header_get_default( :rtype: ~azure.core.polling.LROPoller[~lro.models.Product] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -4995,7 +4972,6 @@ def begin_post_double_headers_final_azure_header_get_default( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -5020,15 +4996,15 @@ def get_long_running_output(pipeline_response): def _post_async_retry_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -5074,10 +5050,10 @@ def _post_async_retry_succeeded_initial( @distributed_trace def begin_post_async_retry_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -5097,7 +5073,7 @@ def begin_post_async_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -5108,7 +5084,6 @@ def begin_post_async_retry_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -5133,15 +5108,15 @@ def get_long_running_output(pipeline_response): def _post_async_no_retry_succeeded_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -5187,10 +5162,10 @@ def _post_async_no_retry_succeeded_initial( @distributed_trace def begin_post_async_no_retry_succeeded( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running post request, service returns a 202 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -5210,7 +5185,7 @@ def begin_post_async_no_retry_succeeded( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -5221,7 +5196,6 @@ def begin_post_async_no_retry_succeeded( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -5246,7 +5220,7 @@ def get_long_running_output(pipeline_response): def _post_async_retry_failed_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -5293,7 +5267,7 @@ def _post_async_retry_failed_initial( # pylint: disable=inconsistent-return-sta @distributed_trace def begin_post_async_retry_failed( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -5349,7 +5323,7 @@ def get_long_running_output(pipeline_response): def _post_async_retrycanceled_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -5396,7 +5370,7 @@ def _post_async_retrycanceled_initial( # pylint: disable=inconsistent-return-st @distributed_trace def begin_post_async_retrycanceled( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py index c96f95607d3..b5157c5b441 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py @@ -652,15 +652,15 @@ def __init__(self, *args, **kwargs): def _put_non_retry400_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -700,10 +700,10 @@ def _put_non_retry400_initial( @distributed_trace def begin_put_non_retry400( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 400 to the initial request. :param product: Product to put. Default value is None. @@ -721,7 +721,7 @@ def begin_put_non_retry400( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -732,7 +732,6 @@ def begin_put_non_retry400( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -757,15 +756,15 @@ def get_long_running_output(pipeline_response): def _put_non_retry201_creating400_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -805,10 +804,10 @@ def _put_non_retry201_creating400_initial( @distributed_trace def begin_put_non_retry201_creating400( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code. @@ -827,7 +826,7 @@ def begin_put_non_retry201_creating400( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -838,7 +837,6 @@ def begin_put_non_retry201_creating400( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -863,15 +861,15 @@ def get_long_running_output(pipeline_response): def _put_non_retry201_creating400_invalid_json_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -911,10 +909,10 @@ def _put_non_retry201_creating400_invalid_json_initial( @distributed_trace def begin_put_non_retry201_creating400_invalid_json( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code. @@ -933,7 +931,7 @@ def begin_put_non_retry201_creating400_invalid_json( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -944,7 +942,6 @@ def begin_put_non_retry201_creating400_invalid_json( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -969,15 +966,15 @@ def get_long_running_output(pipeline_response): def _put_async_relative_retry400_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1020,10 +1017,10 @@ def _put_async_relative_retry400_initial( @distributed_trace def begin_put_async_relative_retry400( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 with ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1042,7 +1039,7 @@ def begin_put_async_relative_retry400( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1332,7 +1329,7 @@ def get_long_running_output(pipeline_response): def _post_non_retry400_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -1376,7 +1373,7 @@ def _post_non_retry400_initial( # pylint: disable=inconsistent-return-statement @distributed_trace def begin_post_non_retry400( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -1430,7 +1427,7 @@ def get_long_running_output(pipeline_response): def _post202_non_retry400_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -1474,7 +1471,7 @@ def _post202_non_retry400_initial( # pylint: disable=inconsistent-return-statem @distributed_trace def begin_post202_non_retry400( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -1528,7 +1525,7 @@ def get_long_running_output(pipeline_response): def _post_async_relative_retry400_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -1575,7 +1572,7 @@ def _post_async_relative_retry400_initial( # pylint: disable=inconsistent-retur @distributed_trace def begin_post_async_relative_retry400( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -1630,15 +1627,15 @@ def get_long_running_output(pipeline_response): def _put_error201_no_provisioning_state_payload_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1678,10 +1675,10 @@ def _put_error201_no_provisioning_state_payload_initial( @distributed_trace def begin_put_error201_no_provisioning_state_payload( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 201 to the initial request with no payload. :param product: Product to put. Default value is None. @@ -1699,7 +1696,7 @@ def begin_put_error201_no_provisioning_state_payload( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1710,7 +1707,6 @@ def begin_put_error201_no_provisioning_state_payload( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -1735,15 +1731,15 @@ def get_long_running_output(pipeline_response): def _put_async_relative_retry_no_status_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1786,10 +1782,10 @@ def _put_async_relative_retry_no_status_initial( @distributed_trace def begin_put_async_relative_retry_no_status( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1809,7 +1805,7 @@ def begin_put_async_relative_retry_no_status( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -1852,15 +1848,15 @@ def get_long_running_output(pipeline_response): def _put_async_relative_retry_no_status_payload_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -1903,10 +1899,10 @@ def _put_async_relative_retry_no_status_payload_initial( @distributed_trace def begin_put_async_relative_retry_no_status_payload( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -1926,7 +1922,7 @@ def begin_put_async_relative_retry_no_status_payload( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2133,7 +2129,7 @@ def get_long_running_output(pipeline_response): def _post202_no_location_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -2177,7 +2173,7 @@ def _post202_no_location_initial( # pylint: disable=inconsistent-return-stateme @distributed_trace def begin_post202_no_location( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -2232,7 +2228,7 @@ def get_long_running_output(pipeline_response): def _post_async_relative_retry_no_payload_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -2279,7 +2275,7 @@ def _post_async_relative_retry_no_payload_initial( # pylint: disable=inconsiste @distributed_trace def begin_post_async_relative_retry_no_payload( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -2335,15 +2331,15 @@ def get_long_running_output(pipeline_response): def _put200_invalid_json_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, "Product") @@ -2381,10 +2377,10 @@ def _put200_invalid_json_initial( @distributed_trace def begin_put200_invalid_json( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that is not a valid json. @@ -2403,7 +2399,7 @@ def begin_put200_invalid_json( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2414,7 +2410,6 @@ def begin_put200_invalid_json( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("Product", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -2439,15 +2434,15 @@ def get_long_running_output(pipeline_response): def _put_async_relative_retry_invalid_header_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2490,10 +2485,10 @@ def _put_async_relative_retry_invalid_header_initial( @distributed_trace def begin_put_async_relative_retry_invalid_header( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. The endpoint indicated in the Azure-AsyncOperation header is invalid. @@ -2513,7 +2508,7 @@ def begin_put_async_relative_retry_invalid_header( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2556,15 +2551,15 @@ def get_long_running_output(pipeline_response): def _put_async_relative_retry_invalid_json_polling_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if product is not None: _json = self._serialize.body(product, "Product") @@ -2607,10 +2602,10 @@ def _put_async_relative_retry_invalid_json_polling_initial( @distributed_trace def begin_put_async_relative_retry_invalid_json_polling( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Long running put request, service returns a 200 to the initial request, with an entity that contains ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status. @@ -2630,7 +2625,7 @@ def begin_put_async_relative_retry_invalid_json_polling( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -2929,7 +2924,7 @@ def get_long_running_output(pipeline_response): def _post202_retry_invalid_header_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -2973,7 +2968,7 @@ def _post202_retry_invalid_header_initial( # pylint: disable=inconsistent-retur @distributed_trace def begin_post202_retry_invalid_header( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -3028,7 +3023,7 @@ def get_long_running_output(pipeline_response): def _post_async_relative_retry_invalid_header_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -3075,7 +3070,7 @@ def _post_async_relative_retry_invalid_header_initial( # pylint: disable=incons @distributed_trace def begin_post_async_relative_retry_invalid_header( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] @@ -3131,7 +3126,7 @@ def get_long_running_output(pipeline_response): def _post_async_relative_retry_invalid_json_polling_initial( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -3178,7 +3173,7 @@ def _post_async_relative_retry_invalid_json_polling_initial( # pylint: disable= @distributed_trace def begin_post_async_relative_retry_invalid_json_polling( # pylint: disable=inconsistent-return-statements self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> LROPoller[None] diff --git a/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py b/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py index 6b3a4bdca54..a339136398f 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py @@ -103,7 +103,6 @@ async def begin_poll_with_parameterized_endpoints(self, account_name: str, **kwa kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("str", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -218,7 +217,6 @@ async def begin_poll_with_constant_parameterized_endpoints( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("str", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) diff --git a/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py b/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py index 402f1880fe5..d6d25443bdc 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py @@ -165,7 +165,6 @@ def begin_poll_with_parameterized_endpoints( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("str", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -286,7 +285,6 @@ def begin_poll_with_constant_parameterized_endpoints( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("str", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) diff --git a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py index a8143d839e1..b38311f5f57 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py @@ -74,7 +74,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_no_item_name_pages(self, **kwargs: Any) -> AsyncIterable["_models.ProductResultValue"]: + def get_no_item_name_pages(self, **kwargs: Any) -> AsyncIterable[_models.ProductResultValue]: """A paging operation that must return result of the default 'value' node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -82,7 +82,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> AsyncIterable["_models.Produc :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResultValue] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -132,7 +132,7 @@ async def get_next(next_link=None): get_no_item_name_pages.metadata = {"url": "/paging/noitemname"} # type: ignore @distributed_trace - def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that must ignore any kind of nextLink, and stop after page 1. :keyword callable cls: A custom type or function that will be passed the direct response @@ -140,7 +140,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncIterable["_models :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -190,7 +190,7 @@ async def get_next(next_link=None): get_null_next_link_name_pages.metadata = {"url": "/paging/nullnextlink"} # type: ignore @distributed_trace - def get_single_pages(self, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_single_pages(self, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that finishes on the first call without a nextlink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -198,7 +198,7 @@ def get_single_pages(self, **kwargs: Any) -> AsyncIterable["_models.ProductResul :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -248,7 +248,7 @@ async def get_next(next_link=None): get_single_pages.metadata = {"url": "/paging/single"} # type: ignore @distributed_trace - def first_response_empty(self, **kwargs: Any) -> AsyncIterable["_models.ProductResultValue"]: + def first_response_empty(self, **kwargs: Any) -> AsyncIterable[_models.ProductResultValue]: """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -257,7 +257,7 @@ def first_response_empty(self, **kwargs: Any) -> AsyncIterable["_models.ProductR :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResultValue] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -310,9 +310,9 @@ async def get_next(next_link=None): def get_multiple_pages( self, client_request_id: Optional[str] = None, - paging_get_multiple_pages_options: Optional["_models.PagingGetMultiplePagesOptions"] = None, + paging_get_multiple_pages_options: Optional[_models.PagingGetMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -324,7 +324,7 @@ def get_multiple_pages( :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -392,7 +392,7 @@ async def get_next(next_link=None): @distributed_trace def get_with_query_params( self, required_query_parameter: int, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -409,7 +409,7 @@ def get_with_query_params( :raises: ~azure.core.exceptions.HttpResponseError """ query_constant = kwargs.pop("query_constant", True) # type: bool - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -462,7 +462,7 @@ async def get_next(next_link=None): get_with_query_params.metadata = {"url": "/paging/multiple/getWithQueryParams"} # type: ignore @distributed_trace - def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -474,7 +474,7 @@ def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> Async :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -528,9 +528,9 @@ async def get_next(next_link=None): def get_odata_multiple_pages( self, client_request_id: Optional[str] = None, - paging_get_odata_multiple_pages_options: Optional["_models.PagingGetOdataMultiplePagesOptions"] = None, + paging_get_odata_multiple_pages_options: Optional[_models.PagingGetOdataMultiplePagesOptions] = None, **kwargs: Any - ) -> AsyncIterable["_models.OdataProductResult"]: + ) -> AsyncIterable[_models.OdataProductResult]: """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -543,7 +543,7 @@ def get_odata_multiple_pages( :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.OdataProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -611,10 +611,10 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_with_offset( self, - paging_get_multiple_pages_with_offset_options: "_models.PagingGetMultiplePagesWithOffsetOptions", + paging_get_multiple_pages_with_offset_options: _models.PagingGetMultiplePagesWithOffsetOptions, client_request_id: Optional[str] = None, **kwargs: Any - ) -> AsyncIterable["_models.ProductResult"]: + ) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. @@ -627,7 +627,7 @@ def get_multiple_pages_with_offset( :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -699,7 +699,7 @@ async def get_next(next_link=None): get_multiple_pages_with_offset.metadata = {"url": "/paging/multiple/withpath/{offset}"} # type: ignore @distributed_trace - def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -708,7 +708,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncIterable["_model :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -758,7 +758,7 @@ async def get_next(next_link=None): get_multiple_pages_retry_first.metadata = {"url": "/paging/multiple/retryfirst"} # type: ignore @distributed_trace - def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -767,7 +767,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncIterable["_mode :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -817,7 +817,7 @@ async def get_next(next_link=None): get_multiple_pages_retry_second.metadata = {"url": "/paging/multiple/retrysecond"} # type: ignore @distributed_trace - def get_single_pages_failure(self, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_single_pages_failure(self, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that receives a 400 on the first call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -825,7 +825,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> AsyncIterable["_models.Prod :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -875,7 +875,7 @@ async def get_next(next_link=None): get_single_pages_failure.metadata = {"url": "/paging/single/failure"} # type: ignore @distributed_trace - def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that receives a 400 on the second call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -883,7 +883,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncIterable["_models.Pr :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -933,7 +933,7 @@ async def get_next(next_link=None): get_multiple_pages_failure.metadata = {"url": "/paging/multiple/failure"} # type: ignore @distributed_trace - def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """A paging operation that receives an invalid nextLink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -941,7 +941,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncIterable["_model :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -993,7 +993,7 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_next_link( self, api_version: str, tenant: str, **kwargs: Any - ) -> AsyncIterable["_models.OdataProductResult"]: + ) -> AsyncIterable[_models.OdataProductResult]: """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. @@ -1005,7 +1005,7 @@ def get_multiple_pages_fragment_next_link( :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.OdataProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1061,8 +1061,8 @@ async def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( - self, custom_parameter_group: "_models.CustomParameterGroup", **kwargs: Any - ) -> AsyncIterable["_models.OdataProductResult"]: + self, custom_parameter_group: _models.CustomParameterGroup, **kwargs: Any + ) -> AsyncIterable[_models.OdataProductResult]: """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. @@ -1072,7 +1072,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( :rtype: ~azure.core.async_paging.AsyncItemPaged[~paging.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.OdataProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1139,13 +1139,13 @@ async def get_next(next_link=None): async def _get_multiple_pages_lro_initial( self, client_request_id: Optional[str] = None, - paging_get_multiple_pages_lro_options: Optional["_models.PagingGetMultiplePagesLroOptions"] = None, + paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any - ) -> "_models.ProductResult": + ) -> _models.ProductResult: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] _maxresults = None _timeout = None @@ -1184,9 +1184,9 @@ async def _get_multiple_pages_lro_initial( async def begin_get_multiple_pages_lro( self, client_request_id: Optional[str] = None, - paging_get_multiple_pages_lro_options: Optional["_models.PagingGetMultiplePagesLroOptions"] = None, + paging_get_multiple_pages_lro_options: Optional[_models.PagingGetMultiplePagesLroOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.ProductResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.ProductResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1208,7 +1208,7 @@ async def begin_get_multiple_pages_lro( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1311,7 +1311,7 @@ async def internal_get_next(next_link=None): @distributed_trace def get_paging_model_with_item_name_with_xms_client_name( self, **kwargs: Any - ) -> AsyncIterable["_models.ProductResultValueWithXMSClientName"]: + ) -> AsyncIterable[_models.ProductResultValueWithXMSClientName]: """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. @@ -1322,7 +1322,7 @@ def get_paging_model_with_item_name_with_xms_client_name( ~azure.core.async_paging.AsyncItemPaged[~paging.models.ProductResultValueWithXMSClientName] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResultValueWithXMSClientName"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResultValueWithXMSClientName] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) diff --git a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_auto_rest_paging_test_service_enums.py b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_auto_rest_paging_test_service_enums.py index 76a0c9dec31..2ed0dacfdd1 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_auto_rest_paging_test_service_enums.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_auto_rest_paging_test_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class OperationResultStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class OperationResultStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The status of the request""" SUCCEEDED = "Succeeded" diff --git a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py index 56213f1f893..5998299b176 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py @@ -10,8 +10,6 @@ import msrest.serialization -from ._auto_rest_paging_test_service_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py index ed5c987bc11..0943aa53105 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py @@ -608,7 +608,7 @@ def __init__(self, *args, **kwargs): def get_no_item_name_pages( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResultValue"] + # type: (...) -> Iterable[_models.ProductResultValue] """A paging operation that must return result of the default 'value' node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -616,7 +616,7 @@ def get_no_item_name_pages( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResultValue] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -669,7 +669,7 @@ def get_next(next_link=None): def get_null_next_link_name_pages( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that must ignore any kind of nextLink, and stop after page 1. :keyword callable cls: A custom type or function that will be passed the direct response @@ -677,7 +677,7 @@ def get_null_next_link_name_pages( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -730,7 +730,7 @@ def get_next(next_link=None): def get_single_pages( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that finishes on the first call without a nextlink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -738,7 +738,7 @@ def get_single_pages( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -791,7 +791,7 @@ def get_next(next_link=None): def first_response_empty( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResultValue"] + # type: (...) -> Iterable[_models.ProductResultValue] """A paging operation whose first response's items list is empty, but still returns a next link. Second (and final) call, will give you an items list of 1. @@ -800,7 +800,7 @@ def first_response_empty( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResultValue] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResultValue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResultValue] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -853,10 +853,10 @@ def get_next(next_link=None): def get_multiple_pages( self, client_request_id=None, # type: Optional[str] - paging_get_multiple_pages_options=None, # type: Optional["_models.PagingGetMultiplePagesOptions"] + paging_get_multiple_pages_options=None, # type: Optional[_models.PagingGetMultiplePagesOptions] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -868,7 +868,7 @@ def get_multiple_pages( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -939,7 +939,7 @@ def get_with_query_params( required_query_parameter, # type: int **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a next operation. It has a different query parameter from it's next operation nextOperationWithQueryParams. Returns a ProductResult. @@ -956,7 +956,7 @@ def get_with_query_params( :raises: ~azure.core.exceptions.HttpResponseError """ query_constant = kwargs.pop("query_constant", True) # type: bool - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1014,7 +1014,7 @@ def duplicate_params( filter=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """Define ``filter`` as a query param for all calls. However, the returned next link will also include the ``filter`` as part of it. Make sure you don't end up duplicating the ``filter`` param in the url sent. @@ -1026,7 +1026,7 @@ def duplicate_params( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1080,10 +1080,10 @@ def get_next(next_link=None): def get_odata_multiple_pages( self, client_request_id=None, # type: Optional[str] - paging_get_odata_multiple_pages_options=None, # type: Optional["_models.PagingGetOdataMultiplePagesOptions"] + paging_get_odata_multiple_pages_options=None, # type: Optional[_models.PagingGetOdataMultiplePagesOptions] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.OdataProductResult"] + # type: (...) -> Iterable[_models.OdataProductResult] """A paging operation that includes a nextLink in odata format that has 10 pages. :param client_request_id: Default value is None. @@ -1096,7 +1096,7 @@ def get_odata_multiple_pages( :rtype: ~azure.core.paging.ItemPaged[~paging.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.OdataProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1164,11 +1164,11 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_with_offset( self, - paging_get_multiple_pages_with_offset_options, # type: "_models.PagingGetMultiplePagesWithOffsetOptions" + paging_get_multiple_pages_with_offset_options, # type: _models.PagingGetMultiplePagesWithOffsetOptions client_request_id=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a nextLink that has 10 pages. :param paging_get_multiple_pages_with_offset_options: Parameter group. @@ -1181,7 +1181,7 @@ def get_multiple_pages_with_offset( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1256,7 +1256,7 @@ def get_next(next_link=None): def get_multiple_pages_retry_first( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that fails on the first call with 500 and then retries and then get a response including a nextLink that has 10 pages. @@ -1265,7 +1265,7 @@ def get_multiple_pages_retry_first( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1318,7 +1318,7 @@ def get_next(next_link=None): def get_multiple_pages_retry_second( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that includes a nextLink that has 10 pages, of which the 2nd call fails first with 500. The client should retry and finish all 10 pages eventually. @@ -1327,7 +1327,7 @@ def get_multiple_pages_retry_second( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1380,7 +1380,7 @@ def get_next(next_link=None): def get_single_pages_failure( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that receives a 400 on the first call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1388,7 +1388,7 @@ def get_single_pages_failure( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1441,7 +1441,7 @@ def get_next(next_link=None): def get_multiple_pages_failure( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that receives a 400 on the second call. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1449,7 +1449,7 @@ def get_multiple_pages_failure( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1502,7 +1502,7 @@ def get_next(next_link=None): def get_multiple_pages_failure_uri( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResult"] + # type: (...) -> Iterable[_models.ProductResult] """A paging operation that receives an invalid nextLink. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1510,7 +1510,7 @@ def get_multiple_pages_failure_uri( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1566,7 +1566,7 @@ def get_multiple_pages_fragment_next_link( tenant, # type: str **kwargs # type: Any ): - # type: (...) -> Iterable["_models.OdataProductResult"] + # type: (...) -> Iterable[_models.OdataProductResult] """A paging operation that doesn't return a full URL, just a fragment. :param api_version: Sets the api version to use. @@ -1578,7 +1578,7 @@ def get_multiple_pages_fragment_next_link( :rtype: ~azure.core.paging.ItemPaged[~paging.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.OdataProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1635,10 +1635,10 @@ def get_next(next_link=None): @distributed_trace def get_multiple_pages_fragment_with_grouping_next_link( self, - custom_parameter_group, # type: "_models.CustomParameterGroup" + custom_parameter_group, # type: _models.CustomParameterGroup **kwargs # type: Any ): - # type: (...) -> Iterable["_models.OdataProductResult"] + # type: (...) -> Iterable[_models.OdataProductResult] """A paging operation that doesn't return a full URL, just a fragment with parameters grouped. :param custom_parameter_group: Parameter group. @@ -1648,7 +1648,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( :rtype: ~azure.core.paging.ItemPaged[~paging.models.OdataProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.OdataProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.OdataProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1715,14 +1715,14 @@ def get_next(next_link=None): def _get_multiple_pages_lro_initial( self, client_request_id=None, # type: Optional[str] - paging_get_multiple_pages_lro_options=None, # type: Optional["_models.PagingGetMultiplePagesLroOptions"] + paging_get_multiple_pages_lro_options=None, # type: Optional[_models.PagingGetMultiplePagesLroOptions] **kwargs # type: Any ): - # type: (...) -> "_models.ProductResult" + # type: (...) -> _models.ProductResult error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] _maxresults = None _timeout = None @@ -1761,10 +1761,10 @@ def _get_multiple_pages_lro_initial( def begin_get_multiple_pages_lro( self, client_request_id=None, # type: Optional[str] - paging_get_multiple_pages_lro_options=None, # type: Optional["_models.PagingGetMultiplePagesLroOptions"] + paging_get_multiple_pages_lro_options=None, # type: Optional[_models.PagingGetMultiplePagesLroOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.ProductResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.ProductResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -1786,7 +1786,7 @@ def begin_get_multiple_pages_lro( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -1888,7 +1888,7 @@ def internal_get_next(next_link=None): def get_paging_model_with_item_name_with_xms_client_name( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.ProductResultValueWithXMSClientName"] + # type: (...) -> Iterable[_models.ProductResultValueWithXMSClientName] """A paging operation that returns a paging model whose item name is is overriden by x-ms-client-name 'indexes'. @@ -1898,7 +1898,7 @@ def get_paging_model_with_item_name_with_xms_client_name( :rtype: ~azure.core.paging.ItemPaged[~paging.models.ProductResultValueWithXMSClientName] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResultValueWithXMSClientName"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResultValueWithXMSClientName] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) diff --git a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py index 4caa88c6f64..b3cc56fcb04 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py @@ -65,11 +65,11 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def check_name_availability( self, - account_name: "_models.StorageAccountCheckNameAvailabilityParameters", + account_name: _models.StorageAccountCheckNameAvailabilityParameters, *, content_type: Optional[str] = "application/json", **kwargs: Any - ) -> "_models.CheckNameAvailabilityResult": + ) -> _models.CheckNameAvailabilityResult: """Checks that account name is valid and is not in use. :param account_name: The name of the storage account within the specified resource group. @@ -88,7 +88,7 @@ async def check_name_availability( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.CheckNameAvailabilityResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.CheckNameAvailabilityResult] _json = self._serialize.body(account_name, "StorageAccountCheckNameAvailabilityParameters") @@ -124,16 +124,16 @@ async def _create_initial( self, resource_group_name: str, account_name: str, - parameters: "_models.StorageAccountCreateParameters", + parameters: _models.StorageAccountCreateParameters, *, content_type: Optional[str] = "application/json", **kwargs: Any - ) -> Optional["_models.StorageAccount"]: + ) -> Optional[_models.StorageAccount]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.StorageAccount"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.StorageAccount]] _json = self._serialize.body(parameters, "StorageAccountCreateParameters") @@ -174,11 +174,11 @@ async def begin_create( self, resource_group_name: str, account_name: str, - parameters: "_models.StorageAccountCreateParameters", + parameters: _models.StorageAccountCreateParameters, *, content_type: Optional[str] = "application/json", **kwargs: Any - ) -> AsyncLROPoller["_models.StorageAccount"]: + ) -> AsyncLROPoller[_models.StorageAccount]: """Asynchronously creates a new storage account with the specified parameters. Existing accounts cannot be updated with this API and should instead use the Update Storage Account API. If an account is already created and subsequent PUT request is issued with exact same set of @@ -209,7 +209,7 @@ async def begin_create( :raises: ~azure.core.exceptions.HttpResponseError """ api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccount"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccount] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -226,7 +226,6 @@ async def begin_create( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("StorageAccount", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -299,7 +298,7 @@ async def delete( # pylint: disable=inconsistent-return-statements @distributed_trace_async async def get_properties( self, resource_group_name: str, account_name: str, **kwargs: Any - ) -> "_models.StorageAccount": + ) -> _models.StorageAccount: """Returns the properties for the specified storage account including but not limited to name, account type, location, and account status. The ListKeys operation should be used to retrieve storage keys. @@ -319,7 +318,7 @@ async def get_properties( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccount"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccount] request = build_get_properties_request( resource_group_name=resource_group_name, @@ -354,11 +353,11 @@ async def update( self, resource_group_name: str, account_name: str, - parameters: "_models.StorageAccountUpdateParameters", + parameters: _models.StorageAccountUpdateParameters, *, content_type: Optional[str] = "application/json", **kwargs: Any - ) -> "_models.StorageAccount": + ) -> _models.StorageAccount: """Updates the account type or tags for a storage account. It can also be used to add a custom domain (note that custom domains cannot be added via the Create operation). Only one custom domain is supported per storage account. This API can only be used to update one of tags, @@ -388,7 +387,7 @@ async def update( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccount"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccount] _json = self._serialize.body(parameters, "StorageAccountUpdateParameters") @@ -423,9 +422,7 @@ async def update( update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}"} # type: ignore @distributed_trace_async - async def list_keys( - self, resource_group_name: str, account_name: str, **kwargs: Any - ) -> "_models.StorageAccountKeys": + async def list_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.StorageAccountKeys: """Lists the access keys for the specified storage account. :param resource_group_name: The name of the resource group within the user’s subscription. @@ -441,7 +438,7 @@ async def list_keys( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountKeys"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountKeys] request = build_list_keys_request( resource_group_name=resource_group_name, @@ -472,7 +469,7 @@ async def list_keys( list_keys.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/listKeys"} # type: ignore @distributed_trace - def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccountListResult"]: + def list(self, **kwargs: Any) -> AsyncIterable[_models.StorageAccountListResult]: """Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the ListKeys operation for this. @@ -483,7 +480,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccountListResult :raises: ~azure.core.exceptions.HttpResponseError """ api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountListResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountListResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -538,7 +535,7 @@ async def get_next(next_link=None): @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any - ) -> AsyncIterable["_models.StorageAccountListResult"]: + ) -> AsyncIterable[_models.StorageAccountListResult]: """Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; use the ListKeys operation for this. @@ -551,7 +548,7 @@ def list_by_resource_group( :raises: ~azure.core.exceptions.HttpResponseError """ api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountListResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountListResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -614,7 +611,7 @@ async def regenerate_key( *, content_type: Optional[str] = "application/json", **kwargs: Any - ) -> "_models.StorageAccountKeys": + ) -> _models.StorageAccountKeys: """Regenerates the access keys for the specified storage account. :param resource_group_name: The name of the resource group within the user’s subscription. @@ -637,7 +634,7 @@ async def regenerate_key( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountKeys"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountKeys] _regenerate_key = _models.StorageAccountRegenerateKeyParameters(key_name=key_name) _json = self._serialize.body(_regenerate_key, "StorageAccountRegenerateKeyParameters") diff --git a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py index 509329ce1d7..fdf60997238 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py @@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def list(self, **kwargs: Any) -> "_models.UsageListResult": + async def list(self, **kwargs: Any) -> _models.UsageListResult: """Gets the current usage count and the limit for the resources under the subscription. :keyword callable cls: A custom type or function that will be passed the direct response @@ -61,7 +61,7 @@ async def list(self, **kwargs: Any) -> "_models.UsageListResult": error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.UsageListResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.UsageListResult] request = build_list_request( subscription_id=self._config.subscription_id, diff --git a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py index 1fa9c5ad7ca..ba9cb957f05 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py +++ b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py @@ -11,8 +11,6 @@ import msrest.serialization -from ._storage_management_client_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_storage_management_client_enums.py b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_storage_management_client_enums.py index 42ce44d45ef..bc00469d309 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_storage_management_client_enums.py +++ b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_storage_management_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class AccountStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class AccountStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Gets the status indicating whether the primary location of the storage account is available or unavailable. """ @@ -20,7 +19,7 @@ class AccountStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): UNAVAILABLE = "Unavailable" -class AccountType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class AccountType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Gets or sets the account type.""" STANDARD_LRS = "Standard_LRS" @@ -30,13 +29,13 @@ class AccountType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): PREMIUM_LRS = "Premium_LRS" -class KeyName(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyName(str, Enum, metaclass=CaseInsensitiveEnumMeta): KEY1 = "key1" KEY2 = "key2" -class ProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Gets the status of the storage account at the time the operation was called.""" CREATING = "Creating" @@ -44,7 +43,7 @@ class ProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): SUCCEEDED = "Succeeded" -class Reason(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Reason(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Gets the reason that a storage account name could not be used. The Reason element is only returned if NameAvailable is false. """ @@ -53,7 +52,7 @@ class Reason(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): ALREADY_EXISTS = "AlreadyExists" -class UsageUnit(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class UsageUnit(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Gets the unit of measurement.""" COUNT = "Count" diff --git a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py index 88c0febe0cc..3de05a9f7ab 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py @@ -391,10 +391,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def check_name_availability( self, - account_name, # type: "_models.StorageAccountCheckNameAvailabilityParameters" + account_name, # type: _models.StorageAccountCheckNameAvailabilityParameters **kwargs # type: Any ): - # type: (...) -> "_models.CheckNameAvailabilityResult" + # type: (...) -> _models.CheckNameAvailabilityResult """Checks that account name is valid and is not in use. :param account_name: The name of the storage account within the specified resource group. @@ -414,7 +414,7 @@ def check_name_availability( api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.CheckNameAvailabilityResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.CheckNameAvailabilityResult] _json = self._serialize.body(account_name, "StorageAccountCheckNameAvailabilityParameters") @@ -450,16 +450,16 @@ def _create_initial( self, resource_group_name, # type: str account_name, # type: str - parameters, # type: "_models.StorageAccountCreateParameters" + parameters, # type: _models.StorageAccountCreateParameters **kwargs # type: Any ): - # type: (...) -> Optional["_models.StorageAccount"] + # type: (...) -> Optional[_models.StorageAccount] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.StorageAccount"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.StorageAccount]] _json = self._serialize.body(parameters, "StorageAccountCreateParameters") @@ -500,10 +500,10 @@ def begin_create( self, resource_group_name, # type: str account_name, # type: str - parameters, # type: "_models.StorageAccountCreateParameters" + parameters, # type: _models.StorageAccountCreateParameters **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.StorageAccount"] + # type: (...) -> LROPoller[_models.StorageAccount] """Asynchronously creates a new storage account with the specified parameters. Existing accounts cannot be updated with this API and should instead use the Update Storage Account API. If an account is already created and subsequent PUT request is issued with exact same set of @@ -535,7 +535,7 @@ def begin_create( """ api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccount"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccount] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -552,7 +552,6 @@ def begin_create( kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("StorageAccount", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -633,7 +632,7 @@ def get_properties( account_name, # type: str **kwargs # type: Any ): - # type: (...) -> "_models.StorageAccount" + # type: (...) -> _models.StorageAccount """Returns the properties for the specified storage account including but not limited to name, account type, location, and account status. The ListKeys operation should be used to retrieve storage keys. @@ -653,7 +652,7 @@ def get_properties( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccount"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccount] request = build_get_properties_request( resource_group_name=resource_group_name, @@ -688,10 +687,10 @@ def update( self, resource_group_name, # type: str account_name, # type: str - parameters, # type: "_models.StorageAccountUpdateParameters" + parameters, # type: _models.StorageAccountUpdateParameters **kwargs # type: Any ): - # type: (...) -> "_models.StorageAccount" + # type: (...) -> _models.StorageAccount """Updates the account type or tags for a storage account. It can also be used to add a custom domain (note that custom domains cannot be added via the Create operation). Only one custom domain is supported per storage account. This API can only be used to update one of tags, @@ -722,7 +721,7 @@ def update( api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccount"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccount] _json = self._serialize.body(parameters, "StorageAccountUpdateParameters") @@ -763,7 +762,7 @@ def list_keys( account_name, # type: str **kwargs # type: Any ): - # type: (...) -> "_models.StorageAccountKeys" + # type: (...) -> _models.StorageAccountKeys """Lists the access keys for the specified storage account. :param resource_group_name: The name of the resource group within the user’s subscription. @@ -779,7 +778,7 @@ def list_keys( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountKeys"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountKeys] request = build_list_keys_request( resource_group_name=resource_group_name, @@ -813,7 +812,7 @@ def list_keys( def list( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.StorageAccountListResult"] + # type: (...) -> Iterable[_models.StorageAccountListResult] """Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the ListKeys operation for this. @@ -824,7 +823,7 @@ def list( :raises: ~azure.core.exceptions.HttpResponseError """ api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountListResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountListResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -882,7 +881,7 @@ def list_by_resource_group( resource_group_name, # type: str **kwargs # type: Any ): - # type: (...) -> Iterable["_models.StorageAccountListResult"] + # type: (...) -> Iterable[_models.StorageAccountListResult] """Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; use the ListKeys operation for this. @@ -895,7 +894,7 @@ def list_by_resource_group( :raises: ~azure.core.exceptions.HttpResponseError """ api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountListResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountListResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -957,7 +956,7 @@ def regenerate_key( key_name=None, # type: Optional[Union[str, "_models.KeyName"]] **kwargs # type: Any ): - # type: (...) -> "_models.StorageAccountKeys" + # type: (...) -> _models.StorageAccountKeys """Regenerates the access keys for the specified storage account. :param resource_group_name: The name of the resource group within the user’s subscription. @@ -981,7 +980,7 @@ def regenerate_key( api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageAccountKeys"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageAccountKeys] _regenerate_key = _models.StorageAccountRegenerateKeyParameters(key_name=key_name) _json = self._serialize.body(_regenerate_key, "StorageAccountRegenerateKeyParameters") diff --git a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py index 890d3cc47f2..f0facf0ad90 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py @@ -93,7 +93,7 @@ def __init__(self, *args, **kwargs): def list( self, **kwargs # type: Any ): - # type: (...) -> "_models.UsageListResult" + # type: (...) -> _models.UsageListResult """Gets the current usage count and the limit for the resources under the subscription. :keyword callable cls: A custom type or function that will be passed the direct response @@ -105,7 +105,7 @@ def list( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2015-05-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.UsageListResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.UsageListResult] request = build_list_request( subscription_id=self._config.subscription_id, diff --git a/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py b/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py index 854fd110b55..28b6f8e648a 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py @@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_sample_resource_group(self, resource_group_name: str, **kwargs: Any) -> "_models.SampleResourceGroup": + async def get_sample_resource_group(self, resource_group_name: str, **kwargs: Any) -> _models.SampleResourceGroup: """Provides a resouce group with name 'testgroup101' and location 'West US'. :param resource_group_name: Resource Group name 'testgroup101'. @@ -63,7 +63,7 @@ async def get_sample_resource_group(self, resource_group_name: str, **kwargs: An error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2014-04-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.SampleResourceGroup"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SampleResourceGroup] request = build_get_sample_resource_group_request( subscription_id=self._config.subscription_id, diff --git a/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py b/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py index 16c351cb076..f054231a11b 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py +++ b/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py @@ -97,7 +97,7 @@ def get_sample_resource_group( resource_group_name, # type: str **kwargs # type: Any ): - # type: (...) -> "_models.SampleResourceGroup" + # type: (...) -> _models.SampleResourceGroup """Provides a resouce group with name 'testgroup101' and location 'West US'. :param resource_group_name: Resource Group name 'testgroup101'. @@ -111,7 +111,7 @@ def get_sample_resource_group( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "2014-04-01-preview") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.SampleResourceGroup"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SampleResourceGroup] request = build_get_sample_resource_group_request( subscription_id=self._config.subscription_id, diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/__init__.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/__init__.py similarity index 95% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/__init__.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/__init__.py index cf222bbb75c..c3b2f153527 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/__init__.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._patch import DPGClient +from ._dpg_client import DPGClient from ._version import VERSION __version__ = VERSION diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_configuration.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_configuration.py similarity index 95% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_configuration.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_configuration.py index 4e5505c1a71..ecd60fc127d 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_configuration.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_configuration.py @@ -24,7 +24,7 @@ class DPGClientConfiguration(Configuration): # pylint: disable=too-many-instanc def __init__(self, **kwargs: Any) -> None: super(DPGClientConfiguration, self).__init__(**kwargs) - kwargs.setdefault("sdk_moniker", "dpgtestpostprocessplugin/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "dpgtestmodels/{}".format(VERSION)) self._configure(**kwargs) def _configure( diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_dpg_client.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_dpg_client.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_dpg_client.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_dpg_client.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/__init__.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/__init__.py similarity index 93% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/__init__.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/__init__.py index 640222b9c9f..1e6531c1ce9 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/__init__.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._patch import DPGClientOperationsMixin +from ._operations import DPGClientOperationsMixin from ._patch import __all__ as _patch_all from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/_operations.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py similarity index 90% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/_operations.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py index 1259a604a57..1a189d9ae9f 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/_operations.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py @@ -110,7 +110,7 @@ def build_lro_request_initial(mode: str, **kwargs: Any) -> HttpRequest: class DPGClientOperationsMixin(MixinABC): @distributed_trace - def get_model(self, mode: str, **kwargs: Any) -> "_models.Product": + def get_model(self, mode: str, **kwargs: Any) -> _models.Product: """Get models that you will either return to end users as a raw body, or with a model added during grow up. @@ -119,13 +119,13 @@ def get_model(self, mode: str, **kwargs: Any) -> "_models.Product": before returning to users. :type mode: str :return: Product - :rtype: ~dpgtestpostprocesspluginversiontolerant.models.Product + :rtype: ~dpgtestmodelsversiontolerant.models.Product :raises: ~azure.core.exceptions.HttpResponseError """ error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_get_model_request( mode=mode, @@ -149,7 +149,7 @@ def get_model(self, mode: str, **kwargs: Any) -> "_models.Product": return deserialized @distributed_trace - def post_model(self, mode: str, input: "_models.Input", **kwargs: Any) -> "_models.Product": + def post_model(self, mode: str, input: _models.Input, **kwargs: Any) -> _models.Product: """Post either raw response as a model and pass in 'raw' for mode, or grow up your operation to take a model instead, and put in 'model' as mode. @@ -158,16 +158,16 @@ def post_model(self, mode: str, input: "_models.Input", **kwargs: Any) -> "_mode before returning to users. :type mode: str :param input: Please put {'hello': 'world!'}. - :type input: ~dpgtestpostprocesspluginversiontolerant.models.Input + :type input: ~dpgtestmodelsversiontolerant.models.Input :return: Product - :rtype: ~dpgtestpostprocesspluginversiontolerant.models.Product + :rtype: ~dpgtestmodelsversiontolerant.models.Product :raises: ~azure.core.exceptions.HttpResponseError """ error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] _json = self._serialize.body(input, "Input") @@ -195,7 +195,7 @@ def post_model(self, mode: str, input: "_models.Input", **kwargs: Any) -> "_mode return deserialized @distributed_trace - def get_pages(self, mode: str, **kwargs: Any) -> Iterable["_models.ProductResult"]: + def get_pages(self, mode: str, **kwargs: Any) -> Iterable[_models.ProductResult]: """Get pages that you will either return to users in pages of raw bodies, or pages of models following growup. @@ -204,11 +204,10 @@ def get_pages(self, mode: str, **kwargs: Any) -> Iterable["_models.ProductResult before returning to users. :type mode: str :return: An iterator like instance of ProductResult - :rtype: - ~azure.core.paging.ItemPaged[~dpgtestpostprocesspluginversiontolerant.models.ProductResult] + :rtype: ~azure.core.paging.ItemPaged[~dpgtestmodelsversiontolerant.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -253,11 +252,11 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - def _lro_initial(self, mode: str, **kwargs: Any) -> "_models.LROProduct": + def _lro_initial(self, mode: str, **kwargs: Any) -> _models.LROProduct: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.LROProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LROProduct] request = build_lro_request_initial( mode=mode, @@ -281,7 +280,7 @@ def _lro_initial(self, mode: str, **kwargs: Any) -> "_models.LROProduct": return deserialized @distributed_trace - def begin_lro(self, mode: str, **kwargs: Any) -> LROPoller["_models.LROProduct"]: + def begin_lro(self, mode: str, **kwargs: Any) -> LROPoller[_models.LROProduct]: """Long running put request that will either return to end users a final payload of a raw body, or a final payload of a model after the SDK has grown up. @@ -297,11 +296,10 @@ def begin_lro(self, mode: str, **kwargs: Any) -> LROPoller["_models.LROProduct"] :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of LROPoller that returns LROProduct - :rtype: - ~azure.core.polling.LROPoller[~dpgtestpostprocesspluginversiontolerant.models.LROProduct] + :rtype: ~azure.core.polling.LROPoller[~dpgtestmodelsversiontolerant.models.LROProduct] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.LROProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LROProduct] polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -310,7 +308,6 @@ def begin_lro(self, mode: str, **kwargs: Any) -> LROPoller["_models.LROProduct"] kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("LROProduct", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/_patch.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_patch.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_operations/_patch.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_patch.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_patch.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_patch.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_patch.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_patch.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_vendor.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_vendor.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_vendor.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_vendor.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_version.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_version.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/_version.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_version.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/__init__.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/__init__.py similarity index 95% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/__init__.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/__init__.py index 6b705f455b3..06918ab8842 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/__init__.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._patch import DPGClient +from ._dpg_client import DPGClient try: from ._patch import __all__ as _patch_all diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_configuration.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_configuration.py similarity index 95% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_configuration.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_configuration.py index e625cf5e539..677df56ccc0 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_configuration.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_configuration.py @@ -24,7 +24,7 @@ class DPGClientConfiguration(Configuration): # pylint: disable=too-many-instanc def __init__(self, **kwargs: Any) -> None: super(DPGClientConfiguration, self).__init__(**kwargs) - kwargs.setdefault("sdk_moniker", "dpgtestpostprocessplugin/{}".format(VERSION)) + kwargs.setdefault("sdk_moniker", "dpgtestmodels/{}".format(VERSION)) self._configure(**kwargs) def _configure(self, **kwargs: Any) -> None: diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_dpg_client.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_dpg_client.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_dpg_client.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_dpg_client.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/__init__.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/__init__.py similarity index 93% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/__init__.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/__init__.py index 640222b9c9f..1e6531c1ce9 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/__init__.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/__init__.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._patch import DPGClientOperationsMixin +from ._operations import DPGClientOperationsMixin from ._patch import __all__ as _patch_all from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/_operations.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py similarity index 89% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/_operations.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py index baf74d37e07..269158f8772 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/_operations.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py @@ -40,7 +40,7 @@ class DPGClientOperationsMixin(MixinABC): @distributed_trace_async - async def get_model(self, mode: str, **kwargs: Any) -> "_models.Product": + async def get_model(self, mode: str, **kwargs: Any) -> _models.Product: """Get models that you will either return to end users as a raw body, or with a model added during grow up. @@ -49,13 +49,13 @@ async def get_model(self, mode: str, **kwargs: Any) -> "_models.Product": before returning to users. :type mode: str :return: Product - :rtype: ~dpgtestpostprocesspluginversiontolerant.models.Product + :rtype: ~dpgtestmodelsversiontolerant.models.Product :raises: ~azure.core.exceptions.HttpResponseError """ error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_get_model_request( mode=mode, @@ -79,7 +79,7 @@ async def get_model(self, mode: str, **kwargs: Any) -> "_models.Product": return deserialized @distributed_trace_async - async def post_model(self, mode: str, input: "_models.Input", **kwargs: Any) -> "_models.Product": + async def post_model(self, mode: str, input: _models.Input, **kwargs: Any) -> _models.Product: """Post either raw response as a model and pass in 'raw' for mode, or grow up your operation to take a model instead, and put in 'model' as mode. @@ -88,16 +88,16 @@ async def post_model(self, mode: str, input: "_models.Input", **kwargs: Any) -> before returning to users. :type mode: str :param input: Please put {'hello': 'world!'}. - :type input: ~dpgtestpostprocesspluginversiontolerant.models.Input + :type input: ~dpgtestmodelsversiontolerant.models.Input :return: Product - :rtype: ~dpgtestpostprocesspluginversiontolerant.models.Product + :rtype: ~dpgtestmodelsversiontolerant.models.Product :raises: ~azure.core.exceptions.HttpResponseError """ error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] _json = self._serialize.body(input, "Input") @@ -125,7 +125,7 @@ async def post_model(self, mode: str, input: "_models.Input", **kwargs: Any) -> return deserialized @distributed_trace - def get_pages(self, mode: str, **kwargs: Any) -> AsyncIterable["_models.ProductResult"]: + def get_pages(self, mode: str, **kwargs: Any) -> AsyncIterable[_models.ProductResult]: """Get pages that you will either return to users in pages of raw bodies, or pages of models following growup. @@ -135,10 +135,10 @@ def get_pages(self, mode: str, **kwargs: Any) -> AsyncIterable["_models.ProductR :type mode: str :return: An iterator like instance of ProductResult :rtype: - ~azure.core.async_paging.AsyncItemPaged[~dpgtestpostprocesspluginversiontolerant.models.ProductResult] + ~azure.core.async_paging.AsyncItemPaged[~dpgtestmodelsversiontolerant.models.ProductResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.ProductResult"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ProductResult] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) @@ -183,11 +183,11 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - async def _lro_initial(self, mode: str, **kwargs: Any) -> "_models.LROProduct": + async def _lro_initial(self, mode: str, **kwargs: Any) -> _models.LROProduct: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.LROProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LROProduct] request = build_lro_request_initial( mode=mode, @@ -211,7 +211,7 @@ async def _lro_initial(self, mode: str, **kwargs: Any) -> "_models.LROProduct": return deserialized @distributed_trace_async - async def begin_lro(self, mode: str, **kwargs: Any) -> AsyncLROPoller["_models.LROProduct"]: + async def begin_lro(self, mode: str, **kwargs: Any) -> AsyncLROPoller[_models.LROProduct]: """Long running put request that will either return to end users a final payload of a raw body, or a final payload of a model after the SDK has grown up. @@ -227,11 +227,10 @@ async def begin_lro(self, mode: str, **kwargs: Any) -> AsyncLROPoller["_models.L :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. :return: An instance of AsyncLROPoller that returns LROProduct - :rtype: - ~azure.core.polling.AsyncLROPoller[~dpgtestpostprocesspluginversiontolerant.models.LROProduct] + :rtype: ~azure.core.polling.AsyncLROPoller[~dpgtestmodelsversiontolerant.models.LROProduct] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop("cls", None) # type: ClsType["_models.LROProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LROProduct] polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] @@ -240,7 +239,6 @@ async def begin_lro(self, mode: str, **kwargs: Any) -> AsyncLROPoller["_models.L kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize("LROProduct", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/_patch.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_patch.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_operations/_patch.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_patch.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_patch.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_patch.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_patch.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_patch.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_vendor.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_vendor.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/aio/_vendor.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_vendor.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/__init__.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/__init__.py similarity index 96% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/__init__.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/__init__.py index 554fa67821d..35b6c2faba5 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/__init__.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/__init__.py @@ -8,7 +8,7 @@ from ._models_py3 import Input from ._models_py3 import LROProduct -from ._patch import Product +from ._models_py3 import Product from ._models_py3 import ProductResult diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_dpg_client_enums.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_dpg_client_enums.py similarity index 84% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_dpg_client_enums.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_dpg_client_enums.py index 1d48a79ae84..9f4deba2636 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_dpg_client_enums.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_dpg_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ProductReceived(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ProductReceived(str, Enum, metaclass=CaseInsensitiveEnumMeta): RAW = "raw" MODEL = "model" diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_models_py3.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_models_py3.py similarity index 85% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_models_py3.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_models_py3.py index 2bbbd9b8b98..71bd05c311b 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_models_py3.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_models_py3.py @@ -10,8 +10,6 @@ import msrest.serialization -from ._dpg_client_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models @@ -49,7 +47,7 @@ class Product(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar received: Required. Possible values include: "raw", "model". - :vartype received: str or ~dpgtestpostprocesspluginversiontolerant.models.ProductReceived + :vartype received: str or ~dpgtestmodelsversiontolerant.models.ProductReceived """ _validation = { @@ -63,7 +61,7 @@ class Product(msrest.serialization.Model): def __init__(self, *, received: Union[str, "_models.ProductReceived"], **kwargs): """ :keyword received: Required. Possible values include: "raw", "model". - :paramtype received: str or ~dpgtestpostprocesspluginversiontolerant.models.ProductReceived + :paramtype received: str or ~dpgtestmodelsversiontolerant.models.ProductReceived """ super(Product, self).__init__(**kwargs) self.received = received @@ -75,7 +73,7 @@ class LROProduct(Product): All required parameters must be populated in order to send to Azure. :ivar received: Required. Possible values include: "raw", "model". - :vartype received: str or ~dpgtestpostprocesspluginversiontolerant.models.ProductReceived + :vartype received: str or ~dpgtestmodelsversiontolerant.models.ProductReceived :ivar provisioning_state: Required. :vartype provisioning_state: str """ @@ -93,7 +91,7 @@ class LROProduct(Product): def __init__(self, *, received: Union[str, "_models.ProductReceived"], provisioning_state: str, **kwargs): """ :keyword received: Required. Possible values include: "raw", "model". - :paramtype received: str or ~dpgtestpostprocesspluginversiontolerant.models.ProductReceived + :paramtype received: str or ~dpgtestmodelsversiontolerant.models.ProductReceived :keyword provisioning_state: Required. :paramtype provisioning_state: str """ @@ -105,7 +103,7 @@ class ProductResult(msrest.serialization.Model): """ProductResult. :ivar values: - :vartype values: list[~dpgtestpostprocesspluginversiontolerant.models.Product] + :vartype values: list[~dpgtestmodelsversiontolerant.models.Product] :ivar next_link: :vartype next_link: str """ @@ -118,7 +116,7 @@ class ProductResult(msrest.serialization.Model): def __init__(self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs): """ :keyword values: - :paramtype values: list[~dpgtestpostprocesspluginversiontolerant.models.Product] + :paramtype values: list[~dpgtestmodelsversiontolerant.models.Product] :keyword next_link: :paramtype next_link: str """ diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_patch.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_patch.py similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/models/_patch.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_patch.py diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/py.typed b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/py.typed similarity index 100% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/dpgtestpostprocesspluginversiontolerant/py.typed rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/py.typed diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/setup.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/setup.py similarity index 91% rename from test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/setup.py rename to test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/setup.py index de0ae8ff005..4b3e2283726 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/setup.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/setup.py @@ -9,12 +9,12 @@ from setuptools import setup, find_packages -PACKAGE_NAME = "dpgtestpostprocessplugin" +PACKAGE_NAME = "dpgtestmodels" version = "0.1.0" setup( name=PACKAGE_NAME, version=version, - description="dpgtestpostprocessplugin", + description="dpgtestmodels", author_email="", url="", keywords="azure, azure sdk", diff --git a/test/dpg/version-tolerant/requirements.txt b/test/dpg/version-tolerant/requirements.txt index 6881207b92b..484a818e3c0 100644 --- a/test/dpg/version-tolerant/requirements.txt +++ b/test/dpg/version-tolerant/requirements.txt @@ -10,4 +10,4 @@ azure-core==1.20.1 -e ./Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/ -e ./Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/ -e ./Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/ --e ./Expected/AcceptanceTests/DPGTestPostProcessPluginVersionTolerant/ \ No newline at end of file +-e ./Expected/AcceptanceTests/DPGTestModelsVersionTolerant/ diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py index ad3a3f451a5..369b648dcbc 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import TYPE_CHECKING +from . import models as _models + if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any, Iterable, Optional @@ -23,10 +25,10 @@ class MultiapiServiceClientOperationsMixin(object): def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -59,10 +61,10 @@ def begin_test_lro( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -171,7 +173,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py index f0339566c11..dca1db040cf 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py @@ -14,14 +14,16 @@ from azure.core.async_paging import AsyncItemPaged from azure.core.polling import AsyncLROPoller +from .. import models as _models + class MultiapiServiceClientOperationsMixin(object): async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -55,9 +57,9 @@ async def begin_test_lro( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -163,7 +165,7 @@ async def test_one( # pylint: disable=inconsistent-return-statements def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json index eb65146f745..fdf1e632680 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json @@ -88,8 +88,8 @@ "operation_group_one": "OperationGroupOneOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { @@ -105,48 +105,48 @@ }, "_test_lro_initial" : { "sync": { - "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[\"_models.Product\"]\n", + "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[_models.Product]\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapi.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapi.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_initial(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e Optional[\"_models.Product\"]:\n", + "signature": "async def _test_lro_initial(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e Optional[_models.Product]:\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapi.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapi.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "begin_test_lro" : { "sync": { - "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[\"_models.Product\"]\n", + "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[_models.Product]\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapi.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.LROPoller[~multiapi.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[\"_models.Product\"]:\n", + "signature": "async def begin_test_lro(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[_models.Product]:\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapi.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns either Product or the result of\n cls(response)\n:rtype: ~azure.core.polling.AsyncLROPoller[~multiapi.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "_test_lro_and_paging_initial" : { "sync": { - "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.PagingResult\"\n", + "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.PagingResult\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapi.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapi.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e \"_models.PagingResult\":\n", + "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e _models.PagingResult:\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapi.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapi.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" }, "begin_test_lro_and_paging" : { "sync": { - "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[\"_models.PagingResult\"]]\n", + "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[_models.PagingResult]]\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapi.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns an iterator like instance of either PagingResult\n or the result of cls(response)\n:rtype:\n ~azure.core.polling.LROPoller[~azure.core.paging.ItemPaged[~multiapi.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[\"_models.PagingResult\"]]:\n", + "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]:\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapi.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns an iterator like instance of either\n PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.polling.AsyncLROPoller[~azure.core.async_paging.AsyncItemPaged[~multiapi.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py index d38d64212c9..05c6e6d6bd1 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py @@ -83,16 +83,16 @@ async def test_one( # pylint: disable=inconsistent-return-statements async def _test_lro_initial( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + ) -> Optional[_models.Product]: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -133,9 +133,9 @@ async def _test_lro_initial( @distributed_trace_async async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -154,7 +154,7 @@ async def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -171,7 +171,6 @@ async def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -201,15 +200,15 @@ def get_long_running_output(pipeline_response): async def _test_lro_and_paging_initial( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> "_models.PagingResult": + ) -> _models.PagingResult: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -251,9 +250,9 @@ async def _test_lro_and_paging_initial( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -275,7 +274,7 @@ async def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py index 249294cfd01..f55f305023c 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py @@ -207,17 +207,17 @@ def test_one( # pylint: disable=inconsistent-return-statements def _test_lro_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -258,10 +258,10 @@ def _test_lro_initial( @distributed_trace def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -279,7 +279,7 @@ def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -296,7 +296,6 @@ def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -326,16 +325,16 @@ def get_long_running_output(pipeline_response): def _test_lro_and_paging_initial( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> "_models.PagingResult" + # type: (...) -> _models.PagingResult error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -377,10 +376,10 @@ def _test_lro_and_paging_initial( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -402,7 +401,7 @@ def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json index a611f2e3d13..f04ff23190b 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { - "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.ModelTwo\"\n", + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.ModelTwo\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapi.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e \"_models.ModelTwo\":\n", + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e _models.ModelTwo:\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapi.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "id, message" diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py index 6aa136ebb0f..1666c40c7cf 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ async def test_one( id: int, message: Optional[str] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -47,7 +47,7 @@ async def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py index 3bdb1b08b9f..20daece204c 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelTwo"] = None, + parameter_one: Optional[_models.ModelTwo] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py index 8c2a4fce377..96abe260903 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py @@ -103,7 +103,7 @@ def test_one( message=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -121,7 +121,7 @@ def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py index d6c3ba0d4e2..34bde8517ca 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py @@ -110,10 +110,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelTwo"] + parameter_one=None, # type: Optional[_models.ModelTwo] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -130,7 +130,7 @@ def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json index 11865de88b9..a1bdedd4e2d 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_paging" : { "sync": { - "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[\"_models.PagingResult\"]\n", + "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[_models.PagingResult]\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~multiapi.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, - "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[\"_models.PagingResult\"]:\n", + "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[_models.PagingResult]:\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapi.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "" diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py index dea0335fcce..2228c66eb1e 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ class MultiapiServiceClientOperationsMixin: def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -37,7 +37,7 @@ def test_paging( :rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapi.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py index db87a94cf72..b840f24d443 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelThree"] = None, + parameter_one: Optional[_models.ModelThree] = None, **kwargs: Any - ) -> "_models.ModelThree": + ) -> _models.ModelThree: """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py index d677df5fd18..01f0ac00c49 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py @@ -44,7 +44,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_four( # pylint: disable=inconsistent-return-statements self, - input: Optional[Union[IO, "_models.SourcePath"]] = None, + input: Optional[Union[IO, _models.SourcePath]] = None, *, content_type: Optional[Union[str, "_models.ContentType"]] = "application/json", **kwargs: Any diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py index 3924e84430f..d90aecf775b 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_multiapi_service_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload """ diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py index 81ce4b6021c..affa7b61540 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py @@ -93,7 +93,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -101,7 +101,7 @@ def test_paging( :rtype: ~azure.core.paging.ItemPaged[~multiapi.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py index 1e6e3bbcc0d..d89b5d21956 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py @@ -83,10 +83,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelThree"] + parameter_one=None, # type: Optional[_models.ModelThree] **kwargs # type: Any ): - # type: (...) -> "_models.ModelThree" + # type: (...) -> _models.ModelThree """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -103,7 +103,7 @@ def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py index dccb7666eca..4f9c2845bb9 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py @@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_four( # pylint: disable=inconsistent-return-statements self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py index e98ba0eb9dc..2abd5be8e68 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import TYPE_CHECKING +from . import models as _models + if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any, Iterable, Optional @@ -23,10 +25,10 @@ class MultiapiServiceClientOperationsMixin(object): def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -59,10 +61,10 @@ def begin_test_lro( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -172,7 +174,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py index 31d9374b335..2058f59d8c5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py @@ -14,14 +14,16 @@ from azure.core.async_paging import AsyncItemPaged from azure.core.polling import AsyncLROPoller +from .. import models as _models + class MultiapiServiceClientOperationsMixin(object): async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -55,9 +57,9 @@ async def begin_test_lro( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -164,7 +166,7 @@ async def test_one( # pylint: disable=inconsistent-return-statements def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json index 449a27a7996..041f22d8c83 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json @@ -88,8 +88,8 @@ "operation_group_one": "OperationGroupOneOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { @@ -105,48 +105,48 @@ }, "_test_lro_initial" : { "sync": { - "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[\"_models.Product\"]\n", + "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[_models.Product]\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_initial(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e Optional[\"_models.Product\"]:\n", + "signature": "async def _test_lro_initial(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e Optional[_models.Product]:\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "begin_test_lro" : { "sync": { - "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[\"_models.Product\"]\n", + "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[_models.Product]\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.LROPoller[~multiapicredentialdefaultpolicy.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[\"_models.Product\"]:\n", + "signature": "async def begin_test_lro(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[_models.Product]:\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns either Product or the result of\n cls(response)\n:rtype: ~azure.core.polling.AsyncLROPoller[~multiapicredentialdefaultpolicy.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "_test_lro_and_paging_initial" : { "sync": { - "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.PagingResult\"\n", + "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.PagingResult\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapicredentialdefaultpolicy.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e \"_models.PagingResult\":\n", + "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e _models.PagingResult:\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapicredentialdefaultpolicy.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" }, "begin_test_lro_and_paging" : { "sync": { - "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[\"_models.PagingResult\"]]\n", + "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[_models.PagingResult]]\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapicredentialdefaultpolicy.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns an iterator like instance of either PagingResult\n or the result of cls(response)\n:rtype:\n ~azure.core.polling.LROPoller[~azure.core.paging.ItemPaged[~multiapicredentialdefaultpolicy.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[\"_models.PagingResult\"]]:\n", + "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]:\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapicredentialdefaultpolicy.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns an iterator like instance of either\n PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.polling.AsyncLROPoller[~azure.core.async_paging.AsyncItemPaged[~multiapicredentialdefaultpolicy.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py index 329ca61eb1f..60b597294f0 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py @@ -83,16 +83,16 @@ async def test_one( # pylint: disable=inconsistent-return-statements async def _test_lro_initial( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + ) -> Optional[_models.Product]: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -133,9 +133,9 @@ async def _test_lro_initial( @distributed_trace_async async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -154,7 +154,7 @@ async def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -171,7 +171,6 @@ async def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -201,15 +200,15 @@ def get_long_running_output(pipeline_response): async def _test_lro_and_paging_initial( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> "_models.PagingResult": + ) -> _models.PagingResult: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -251,9 +250,9 @@ async def _test_lro_and_paging_initial( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -276,7 +275,7 @@ async def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py index 518747d8cdf..6360a082acd 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py @@ -207,17 +207,17 @@ def test_one( # pylint: disable=inconsistent-return-statements def _test_lro_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -258,10 +258,10 @@ def _test_lro_initial( @distributed_trace def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -279,7 +279,7 @@ def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -296,7 +296,6 @@ def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -326,16 +325,16 @@ def get_long_running_output(pipeline_response): def _test_lro_and_paging_initial( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> "_models.PagingResult" + # type: (...) -> _models.PagingResult error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -377,10 +376,10 @@ def _test_lro_and_paging_initial( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -403,7 +402,7 @@ def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json index 07e2a0acb1d..853e343d0af 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { - "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.ModelTwo\"\n", + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.ModelTwo\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e \"_models.ModelTwo\":\n", + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e _models.ModelTwo:\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "id, message" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py index f5847dd5f9b..f6dce455933 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ async def test_one( id: int, message: Optional[str] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -47,7 +47,7 @@ async def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py index 6c1e91cbfda..3b291c46e89 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelTwo"] = None, + parameter_one: Optional[_models.ModelTwo] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py index 69ce611ed2b..72ba9cfa8cc 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py @@ -103,7 +103,7 @@ def test_one( message=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -121,7 +121,7 @@ def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py index 49f696d5a30..d5d0d1a7f65 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py @@ -110,10 +110,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelTwo"] + parameter_one=None, # type: Optional[_models.ModelTwo] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -130,7 +130,7 @@ def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json index 9c6e95d980d..460823f3fc9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_paging" : { "sync": { - "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[\"_models.PagingResult\"]\n", + "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[_models.PagingResult]\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, - "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[\"_models.PagingResult\"]:\n", + "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[_models.PagingResult]:\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.async_paging.AsyncItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py index aa887483b28..44720d4d189 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ class MultiapiServiceClientOperationsMixin: def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -38,7 +38,7 @@ def test_paging( ~azure.core.async_paging.AsyncItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py index fdc7b5674bf..0946f72a26f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelThree"] = None, + parameter_one: Optional[_models.ModelThree] = None, **kwargs: Any - ) -> "_models.ModelThree": + ) -> _models.ModelThree: """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py index ce5cc76e2ef..7349fd6f2ce 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py @@ -44,7 +44,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_four( # pylint: disable=inconsistent-return-statements self, - input: Optional[Union[IO, "_models.SourcePath"]] = None, + input: Optional[Union[IO, _models.SourcePath]] = None, *, content_type: Optional[Union[str, "_models.ContentType"]] = "application/json", **kwargs: Any diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py index 3924e84430f..d90aecf775b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload """ diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py index afc2e82f262..08c04d92acb 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py @@ -93,7 +93,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -101,7 +101,7 @@ def test_paging( :rtype: ~azure.core.paging.ItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py index b31da27ce6d..9e6f96f3474 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py @@ -83,10 +83,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelThree"] + parameter_one=None, # type: Optional[_models.ModelThree] **kwargs # type: Any ): - # type: (...) -> "_models.ModelThree" + # type: (...) -> _models.ModelThree """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -103,7 +103,7 @@ def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py index f93621cb00c..2edcd8e8316 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py @@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_four( # pylint: disable=inconsistent-return-statements self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py index 9175c337561..c9fef7441d9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import TYPE_CHECKING +from . import models as _models + if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py index bb5c7a69f59..574c9f759d8 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import Any +from .. import models as _models + class MultiapiCustomBaseUrlServiceClientOperationsMixin(object): diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_metadata.json index daeaeeb9b78..3d1490f7840 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_metadata.json @@ -87,8 +87,8 @@ "operation_groups": { }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test" : { "sync": { diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_metadata.json index 4cc7f6b9f6a..9bb2bf4e7b5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_metadata.json @@ -87,8 +87,8 @@ "operation_groups": { }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test" : { "sync": { diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py index 07b88353dbe..376b1350d10 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import TYPE_CHECKING +from . import models as _models + if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any, Iterable, Optional @@ -23,10 +25,10 @@ class MultiapiServiceClientOperationsMixin(object): def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -59,10 +61,10 @@ def begin_test_lro( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -171,7 +173,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py index d9c39dbc01e..20602b78f59 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py @@ -14,14 +14,16 @@ from azure.core.async_paging import AsyncItemPaged from azure.core.polling import AsyncLROPoller +from .. import models as _models + class MultiapiServiceClientOperationsMixin(object): async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -55,9 +57,9 @@ async def begin_test_lro( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -163,7 +165,7 @@ async def test_one( # pylint: disable=inconsistent-return-statements def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_metadata.json index 0f3569e5fd1..be9b18144b9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_metadata.json @@ -88,8 +88,8 @@ "operation_group_one": "OperationGroupOneOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { @@ -105,48 +105,48 @@ }, "_test_lro_initial" : { "sync": { - "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[\"_models.Product\"]\n", + "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[_models.Product]\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapidataplane.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapidataplane.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_initial(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e Optional[\"_models.Product\"]:\n", + "signature": "async def _test_lro_initial(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e Optional[_models.Product]:\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapidataplane.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapidataplane.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "begin_test_lro" : { "sync": { - "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[\"_models.Product\"]\n", + "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[_models.Product]\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapidataplane.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be LROBasePolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.LROPoller[~multiapidataplane.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[\"_models.Product\"]:\n", + "signature": "async def begin_test_lro(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[_models.Product]:\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapidataplane.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncLROBasePolling. Pass in False\n for this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns either Product or the result of\n cls(response)\n:rtype: ~azure.core.polling.AsyncLROPoller[~multiapidataplane.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "_test_lro_and_paging_initial" : { "sync": { - "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.PagingResult\"\n", + "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.PagingResult\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapidataplane.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapidataplane.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e \"_models.PagingResult\":\n", + "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e _models.PagingResult:\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapidataplane.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapidataplane.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" }, "begin_test_lro_and_paging" : { "sync": { - "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[\"_models.PagingResult\"]]\n", + "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[_models.PagingResult]]\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapidataplane.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be LROBasePolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns an iterator like instance of either PagingResult\n or the result of cls(response)\n:rtype:\n ~azure.core.polling.LROPoller[~azure.core.paging.ItemPaged[~multiapidataplane.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[\"_models.PagingResult\"]]:\n", + "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]:\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapidataplane.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncLROBasePolling. Pass in False\n for this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns an iterator like instance of either\n PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.polling.AsyncLROPoller[~azure.core.async_paging.AsyncItemPaged[~multiapidataplane.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py index 342b093b16c..5e2985243f3 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py @@ -82,16 +82,16 @@ async def test_one( # pylint: disable=inconsistent-return-statements async def _test_lro_initial( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + ) -> Optional[_models.Product]: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -132,9 +132,9 @@ async def _test_lro_initial( @distributed_trace_async async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -153,7 +153,7 @@ async def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -170,7 +170,6 @@ async def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -200,15 +199,15 @@ def get_long_running_output(pipeline_response): async def _test_lro_and_paging_initial( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> "_models.PagingResult": + ) -> _models.PagingResult: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -250,9 +249,9 @@ async def _test_lro_and_paging_initial( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -274,7 +273,7 @@ async def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py index fc37eaeb5af..1aa98747a1e 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py @@ -206,17 +206,17 @@ def test_one( # pylint: disable=inconsistent-return-statements def _test_lro_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -257,10 +257,10 @@ def _test_lro_initial( @distributed_trace def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -278,7 +278,7 @@ def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -295,7 +295,6 @@ def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -325,16 +324,16 @@ def get_long_running_output(pipeline_response): def _test_lro_and_paging_initial( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> "_models.PagingResult" + # type: (...) -> _models.PagingResult error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -376,10 +375,10 @@ def _test_lro_and_paging_initial( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -401,7 +400,7 @@ def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_metadata.json index f9bfca1c1ba..3c8efcf9c8e 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { - "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.ModelTwo\"\n", + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.ModelTwo\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapidataplane.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e \"_models.ModelTwo\":\n", + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e _models.ModelTwo:\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapidataplane.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "id, message" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py index 34685679b9b..d0e012e7ac9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py @@ -28,7 +28,7 @@ async def test_one( id: int, message: Optional[str] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -46,7 +46,7 @@ async def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py index 7130073a199..361360d8d5f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py @@ -43,9 +43,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelTwo"] = None, + parameter_one: Optional[_models.ModelTwo] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -62,7 +62,7 @@ async def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py index 1ff6c2b7a7d..748327f4e42 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py @@ -102,7 +102,7 @@ def test_one( message=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -120,7 +120,7 @@ def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py index add39804706..dd1b9c1d4b1 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py @@ -109,10 +109,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelTwo"] + parameter_one=None, # type: Optional[_models.ModelTwo] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -129,7 +129,7 @@ def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_metadata.json index 92187e63696..99f08faa381 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_paging" : { "sync": { - "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[\"_models.PagingResult\"]\n", + "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[_models.PagingResult]\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~multiapidataplane.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, - "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[\"_models.PagingResult\"]:\n", + "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[_models.PagingResult]:\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapidataplane.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py index 70d059382e4..4ad1d981aca 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py @@ -28,7 +28,7 @@ class MultiapiServiceClientOperationsMixin: def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -36,7 +36,7 @@ def test_paging( :rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapidataplane.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py index fa0cf4452d8..91138a66be6 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py @@ -43,9 +43,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelThree"] = None, + parameter_one: Optional[_models.ModelThree] = None, **kwargs: Any - ) -> "_models.ModelThree": + ) -> _models.ModelThree: """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -62,7 +62,7 @@ async def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py index ccc452df45c..a48c7b9cb9c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py @@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_four( # pylint: disable=inconsistent-return-statements self, - input: Optional[Union[IO, "_models.SourcePath"]] = None, + input: Optional[Union[IO, _models.SourcePath]] = None, *, content_type: Optional[Union[str, "_models.ContentType"]] = "application/json", **kwargs: Any diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py index 3924e84430f..d90aecf775b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_multiapi_service_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload """ diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py index 2d92710fc21..2e1cce6f49f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py @@ -92,7 +92,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -100,7 +100,7 @@ def test_paging( :rtype: ~azure.core.paging.ItemPaged[~multiapidataplane.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py index 951e798768a..0c226869632 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py @@ -82,10 +82,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelThree"] + parameter_one=None, # type: Optional[_models.ModelThree] **kwargs # type: Any ): - # type: (...) -> "_models.ModelThree" + # type: (...) -> _models.ModelThree """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -102,7 +102,7 @@ def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py index 0a3ec09e283..042bc8ff2d7 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py @@ -109,7 +109,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_four( # pylint: disable=inconsistent-return-statements self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py index 065c03dbbd8..918bcbf2943 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import TYPE_CHECKING +from . import models as _models + if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any, Iterable, Optional @@ -23,10 +25,10 @@ class MultiapiServiceClientOperationsMixin(object): def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -59,10 +61,10 @@ def begin_test_lro( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -171,7 +173,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json index 009a4702122..1acb812a3fc 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json @@ -88,8 +88,8 @@ "operation_group_one": "OperationGroupOneOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { @@ -105,48 +105,48 @@ }, "_test_lro_initial" : { "sync": { - "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[\"_models.Product\"]\n", + "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[_models.Product]\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapinoasync.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapinoasync.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_initial(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e Optional[\"_models.Product\"]:\n", + "signature": "async def _test_lro_initial(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e Optional[_models.Product]:\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapinoasync.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapinoasync.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "begin_test_lro" : { "sync": { - "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[\"_models.Product\"]\n", + "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[_models.Product]\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapinoasync.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.LROPoller[~multiapinoasync.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[\"_models.Product\"]:\n", + "signature": "async def begin_test_lro(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[_models.Product]:\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapinoasync.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns either Product or the result of\n cls(response)\n:rtype: ~azure.core.polling.AsyncLROPoller[~multiapinoasync.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "_test_lro_and_paging_initial" : { "sync": { - "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.PagingResult\"\n", + "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.PagingResult\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapinoasync.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapinoasync.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e \"_models.PagingResult\":\n", + "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e _models.PagingResult:\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapinoasync.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapinoasync.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" }, "begin_test_lro_and_paging" : { "sync": { - "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[\"_models.PagingResult\"]]\n", + "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[_models.PagingResult]]\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapinoasync.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns an iterator like instance of either PagingResult\n or the result of cls(response)\n:rtype:\n ~azure.core.polling.LROPoller[~azure.core.paging.ItemPaged[~multiapinoasync.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[\"_models.PagingResult\"]]:\n", + "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]:\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options: ~multiapinoasync.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns an iterator like instance of either\n PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.polling.AsyncLROPoller[~azure.core.async_paging.AsyncItemPaged[~multiapinoasync.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py index 45de80c76e1..b8fe90788d5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py @@ -207,17 +207,17 @@ def test_one( # pylint: disable=inconsistent-return-statements def _test_lro_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -258,10 +258,10 @@ def _test_lro_initial( @distributed_trace def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -279,7 +279,7 @@ def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -296,7 +296,6 @@ def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -326,16 +325,16 @@ def get_long_running_output(pipeline_response): def _test_lro_and_paging_initial( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> "_models.PagingResult" + # type: (...) -> _models.PagingResult error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -377,10 +376,10 @@ def _test_lro_and_paging_initial( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -402,7 +401,7 @@ def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json index 25dfcf58d93..fca2fe6162c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { - "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.ModelTwo\"\n", + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.ModelTwo\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapinoasync.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e \"_models.ModelTwo\":\n", + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e _models.ModelTwo:\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapinoasync.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "id, message" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py index ce05dc5bc1a..a4fe7ab2dc2 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py @@ -103,7 +103,7 @@ def test_one( message=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -121,7 +121,7 @@ def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py index e2ae3109289..e0abeb75f5f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py @@ -110,10 +110,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelTwo"] + parameter_one=None, # type: Optional[_models.ModelTwo] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -130,7 +130,7 @@ def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json index 244813c92ca..0c982b7f51f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_paging" : { "sync": { - "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[\"_models.PagingResult\"]\n", + "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[_models.PagingResult]\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~multiapinoasync.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, - "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[\"_models.PagingResult\"]:\n", + "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[_models.PagingResult]:\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapinoasync.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py index 3924e84430f..d90aecf775b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_multiapi_service_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload """ diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py index 142799d6072..b2f04cfb3e4 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py @@ -93,7 +93,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -101,7 +101,7 @@ def test_paging( :rtype: ~azure.core.paging.ItemPaged[~multiapinoasync.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py index c8e4b1d498f..1b16bdb2002 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py @@ -83,10 +83,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelThree"] + parameter_one=None, # type: Optional[_models.ModelThree] **kwargs # type: Any ): - # type: (...) -> "_models.ModelThree" + # type: (...) -> _models.ModelThree """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -103,7 +103,7 @@ def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py index caf30a97070..fca60a6d802 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py @@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_four( # pylint: disable=inconsistent-return-statements self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py index 77314039176..7214daab368 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_operations_mixin.py @@ -11,6 +11,8 @@ from msrest import Serializer, Deserializer from typing import TYPE_CHECKING +from . import models as _models + if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from typing import Any, Iterable, Optional @@ -23,10 +25,10 @@ class MultiapiServiceClientOperationsMixin(object): def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -59,10 +61,10 @@ def begin_test_lro( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -172,7 +174,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin.py index ef1cda4b696..75939a81131 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_operations_mixin.py @@ -14,14 +14,16 @@ from azure.core.async_paging import AsyncItemPaged from azure.core.polling import AsyncLROPoller +from .. import models as _models + class MultiapiServiceClientOperationsMixin(object): async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -55,9 +57,9 @@ async def begin_test_lro( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -164,7 +166,7 @@ async def test_one( # pylint: disable=inconsistent-return-statements def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json index a3f10f6ac1e..d45fcaa4247 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json @@ -88,8 +88,8 @@ "operation_group_one": "OperationGroupOneOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"LROPoller\"], \"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.polling\": [\"AsyncLROPoller\"], \"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { @@ -105,48 +105,48 @@ }, "_test_lro_initial" : { "sync": { - "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[\"_models.Product\"]\n", + "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e Optional[_models.Product]\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapiwithsubmodule.submodule.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapiwithsubmodule.submodule.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_initial(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e Optional[\"_models.Product\"]:\n", + "signature": "async def _test_lro_initial(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e Optional[_models.Product]:\n", "doc": "\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapiwithsubmodule.submodule.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapiwithsubmodule.submodule.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "begin_test_lro" : { "sync": { - "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[\"_models.Product\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[\"_models.Product\"]\n", + "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[_models.Product]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[_models.Product]\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapiwithsubmodule.submodule.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.LROPoller[~multiapiwithsubmodule.submodule.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro(\n self,\n product: Optional[\"_models.Product\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[\"_models.Product\"]:\n", + "signature": "async def begin_test_lro(\n self,\n product: Optional[_models.Product] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[_models.Product]:\n", "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put. Default value is None.\n:type product: ~multiapiwithsubmodule.submodule.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns either Product or the result of\n cls(response)\n:rtype: ~azure.core.polling.AsyncLROPoller[~multiapiwithsubmodule.submodule.v1.models.Product]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "product" }, "_test_lro_and_paging_initial" : { "sync": { - "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.PagingResult\"\n", + "signature": "def _test_lro_and_paging_initial(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.PagingResult\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapiwithsubmodule.submodule.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapiwithsubmodule.submodule.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e \"_models.PagingResult\":\n", + "signature": "async def _test_lro_and_paging_initial(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e _models.PagingResult:\n", "doc": "\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapiwithsubmodule.submodule.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: PagingResult, or the result of cls(response)\n:rtype: ~multiapiwithsubmodule.submodule.v1.models.PagingResult\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" }, "begin_test_lro_and_paging" : { "sync": { - "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[\"_models.TestLroAndPagingOptions\"]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[\"_models.PagingResult\"]]\n", + "signature": "def begin_test_lro_and_paging(\n self,\n client_request_id=None, # type: Optional[str]\n test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions]\n **kwargs # type: Any\n):\n # type: (...) -\u003e LROPoller[ItemPaged[_models.PagingResult]]\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapiwithsubmodule.submodule.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be ARMPolling. Pass in False for this\n operation to not poll, or pass in your own initialized polling object for a personal polling\n strategy.\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of LROPoller that returns an iterator like instance of either PagingResult\n or the result of cls(response)\n:rtype:\n ~azure.core.polling.LROPoller[~azure.core.paging.ItemPaged[~multiapiwithsubmodule.submodule.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[\"_models.TestLroAndPagingOptions\"] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[\"_models.PagingResult\"]]:\n", + "signature": "async def begin_test_lro_and_paging(\n self,\n client_request_id: Optional[str] = None,\n test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None,\n **kwargs: Any\n) -\u003e AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]:\n", "doc": "\"\"\"A long-running paging operation that includes a nextLink that has 10 pages.\n\n:param client_request_id: Default value is None.\n:type client_request_id: str\n:param test_lro_and_paging_options: Parameter group. Default value is None.\n:type test_lro_and_paging_options:\n ~multiapiwithsubmodule.submodule.v1.models.TestLroAndPagingOptions\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for\n this operation to not poll, or pass in your own initialized polling object for a personal\n polling strategy.\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no\n Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns an iterator like instance of either\n PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.polling.AsyncLROPoller[~azure.core.async_paging.AsyncItemPaged[~multiapiwithsubmodule.submodule.v1.models.PagingResult]]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "client_request_id, test_lro_and_paging_options" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py index 2e1fa6451e0..db53b4a9022 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py @@ -83,16 +83,16 @@ async def test_one( # pylint: disable=inconsistent-return-statements async def _test_lro_initial( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> Optional["_models.Product"]: + ) -> Optional[_models.Product]: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -133,9 +133,9 @@ async def _test_lro_initial( @distributed_trace_async async def begin_test_lro( self, - product: Optional["_models.Product"] = None, + product: Optional[_models.Product] = None, **kwargs: Any - ) -> AsyncLROPoller["_models.Product"]: + ) -> AsyncLROPoller[_models.Product]: """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -154,7 +154,7 @@ async def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -171,7 +171,6 @@ async def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -201,15 +200,15 @@ def get_long_running_output(pipeline_response): async def _test_lro_and_paging_initial( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> "_models.PagingResult": + ) -> _models.PagingResult: error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -251,9 +250,9 @@ async def _test_lro_and_paging_initial( async def begin_test_lro_and_paging( self, client_request_id: Optional[str] = None, - test_lro_and_paging_options: Optional["_models.TestLroAndPagingOptions"] = None, + test_lro_and_paging_options: Optional[_models.TestLroAndPagingOptions] = None, **kwargs: Any - ) -> AsyncLROPoller[AsyncItemPaged["_models.PagingResult"]]: + ) -> AsyncLROPoller[AsyncItemPaged[_models.PagingResult]]: """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -276,7 +275,7 @@ async def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py index 610749af656..6da5295039c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py @@ -207,17 +207,17 @@ def test_one( # pylint: disable=inconsistent-return-statements def _test_lro_initial( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> Optional["_models.Product"] + # type: (...) -> Optional[_models.Product] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType[Optional["_models.Product"]] + cls = kwargs.pop('cls', None) # type: ClsType[Optional[_models.Product]] if product is not None: _json = self._serialize.body(product, 'Product') @@ -258,10 +258,10 @@ def _test_lro_initial( @distributed_trace def begin_test_lro( self, - product=None, # type: Optional["_models.Product"] + product=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> LROPoller["_models.Product"] + # type: (...) -> LROPoller[_models.Product] """Put in whatever shape of Product you want, will return a Product with id equal to 100. :param product: Product to put. Default value is None. @@ -279,7 +279,7 @@ def begin_test_lro( :raises: ~azure.core.exceptions.HttpResponseError """ content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.Product] polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] lro_delay = kwargs.pop( 'polling_interval', @@ -296,7 +296,6 @@ def begin_test_lro( kwargs.pop('error_map', None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response deserialized = self._deserialize('Product', pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) @@ -326,16 +325,16 @@ def get_long_running_output(pipeline_response): def _test_lro_and_paging_initial( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> "_models.PagingResult" + # type: (...) -> _models.PagingResult error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] _maxresults = None _timeout = None @@ -377,10 +376,10 @@ def _test_lro_and_paging_initial( def begin_test_lro_and_paging( self, client_request_id=None, # type: Optional[str] - test_lro_and_paging_options=None, # type: Optional["_models.TestLroAndPagingOptions"] + test_lro_and_paging_options=None, # type: Optional[_models.TestLroAndPagingOptions] **kwargs # type: Any ): - # type: (...) -> LROPoller[ItemPaged["_models.PagingResult"]] + # type: (...) -> LROPoller[ItemPaged[_models.PagingResult]] """A long-running paging operation that includes a nextLink that has 10 pages. :param client_request_id: Default value is None. @@ -403,7 +402,7 @@ def begin_test_lro_and_paging( :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json index 013cf0cd8bb..c9f7880c043 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_one" : { "sync": { - "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.ModelTwo\"\n", + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n # type: (...) -\u003e _models.ModelTwo\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapiwithsubmodule.submodule.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": true, - "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e \"_models.ModelTwo\":\n", + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs: Any\n) -\u003e _models.ModelTwo:\n", "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter. Default value is None.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapiwithsubmodule.submodule.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "id, message" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py index 98525eea2da..389e9df69f2 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ async def test_one( id: int, message: Optional[str] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -47,7 +47,7 @@ async def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py index e30e00a2525..ae4025e826c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelTwo"] = None, + parameter_one: Optional[_models.ModelTwo] = None, **kwargs: Any - ) -> "_models.ModelTwo": + ) -> _models.ModelTwo: """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py index ca05cd6bc8e..e3ed077563e 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py @@ -103,7 +103,7 @@ def test_one( message=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. :param id: An int parameter. @@ -121,7 +121,7 @@ def test_one( error_map.update(kwargs.pop('error_map', {})) api_version = kwargs.pop('api_version', "2.0.0") # type: str - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] request = build_test_one_request( diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py index 398b6513056..43156e78381 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py @@ -110,10 +110,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelTwo"] + parameter_one=None, # type: Optional[_models.ModelTwo] **kwargs # type: Any ): - # type: (...) -> "_models.ModelTwo" + # type: (...) -> _models.ModelTwo """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. :param parameter_one: A ModelTwo parameter. Default value is None. @@ -130,7 +130,7 @@ def test_two( api_version = kwargs.pop('api_version', "2.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelTwo"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelTwo] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelTwo') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json index 0f1ad58bb81..fa00d3a1bf8 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json @@ -89,17 +89,17 @@ "operation_group_two": "OperationGroupTwoOperations" }, "operation_mixins": { - "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}}", - "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}}", + "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Iterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.paging\": [\"ItemPaged\"]}}, \"regular\": {\"local\": {\".\": [[\"models\", \"_models\"]]}}}", + "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Optional\"]}, \"azurecore\": {\"azure.core.async_paging\": [\"AsyncItemPaged\"]}}, \"regular\": {\"local\": {\"..\": [[\"models\", \"_models\"]]}}}", "operations": { "test_paging" : { "sync": { - "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[\"_models.PagingResult\"]\n", + "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n # type: (...) -\u003e Iterable[_models.PagingResult]\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~multiapiwithsubmodule.submodule.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "async": { "coroutine": false, - "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[\"_models.PagingResult\"]:\n", + "signature": "def test_paging(\n self,\n **kwargs: Any\n) -\u003e AsyncIterable[_models.PagingResult]:\n", "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype:\n ~azure.core.async_paging.AsyncItemPaged[~multiapiwithsubmodule.submodule.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" }, "call": "" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py index 5bfd9271e15..684a7506481 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py @@ -29,7 +29,7 @@ class MultiapiServiceClientOperationsMixin: def test_paging( self, **kwargs: Any - ) -> AsyncIterable["_models.PagingResult"]: + ) -> AsyncIterable[_models.PagingResult]: """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -38,7 +38,7 @@ def test_paging( ~azure.core.async_paging.AsyncItemPaged[~multiapiwithsubmodule.submodule.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py index 4465726540d..dfdfe9507fd 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py @@ -44,9 +44,9 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_two( self, - parameter_one: Optional["_models.ModelThree"] = None, + parameter_one: Optional[_models.ModelThree] = None, **kwargs: Any - ) -> "_models.ModelThree": + ) -> _models.ModelThree: """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -63,7 +63,7 @@ async def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py index 6de29416a8a..4c15ce77a15 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py @@ -44,7 +44,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace_async async def test_four( # pylint: disable=inconsistent-return-statements self, - input: Optional[Union[IO, "_models.SourcePath"]] = None, + input: Optional[Union[IO, _models.SourcePath]] = None, *, content_type: Optional[Union[str, "_models.ContentType"]] = "application/json", **kwargs: Any diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py index 3924e84430f..d90aecf775b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_multiapi_service_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload """ diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py index 42aeb50b26b..3284aa7b995 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py @@ -93,7 +93,7 @@ def test_paging( self, **kwargs # type: Any ): - # type: (...) -> Iterable["_models.PagingResult"] + # type: (...) -> Iterable[_models.PagingResult] """Returns ModelThree with optionalProperty 'paged'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -101,7 +101,7 @@ def test_paging( :rtype: ~azure.core.paging.ItemPaged[~multiapiwithsubmodule.submodule.v3.models.PagingResult] :raises: ~azure.core.exceptions.HttpResponseError """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.PagingResult"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.PagingResult] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py index 9d5c660d5dd..0d49ded1fe5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py @@ -83,10 +83,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_two( self, - parameter_one=None, # type: Optional["_models.ModelThree"] + parameter_one=None, # type: Optional[_models.ModelThree] **kwargs # type: Any ): - # type: (...) -> "_models.ModelThree" + # type: (...) -> _models.ModelThree """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. :param parameter_one: A ModelThree parameter. Default value is None. @@ -103,7 +103,7 @@ def test_two( api_version = kwargs.pop('api_version', "3.0.0") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ModelThree"] + cls = kwargs.pop('cls', None) # type: ClsType[_models.ModelThree] if parameter_one is not None: _json = self._serialize.body(parameter_one, 'ModelThree') diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py index 71c2724ca6b..0db369db8ad 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py @@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def test_four( # pylint: disable=inconsistent-return-statements self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py index c5258a3a9af..0ff11c14c87 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py @@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def create_ap_true(self, create_parameters: "_models.PetAPTrue", **kwargs: Any) -> "_models.PetAPTrue": + async def create_ap_true(self, create_parameters: _models.PetAPTrue, **kwargs: Any) -> _models.PetAPTrue: """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -69,7 +69,7 @@ async def create_ap_true(self, create_parameters: "_models.PetAPTrue", **kwargs: error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPTrue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPTrue] _json = self._serialize.body(create_parameters, "PetAPTrue") @@ -101,7 +101,7 @@ async def create_ap_true(self, create_parameters: "_models.PetAPTrue", **kwargs: create_ap_true.metadata = {"url": "/additionalProperties/true"} # type: ignore @distributed_trace_async - async def create_cat_ap_true(self, create_parameters: "_models.CatAPTrue", **kwargs: Any) -> "_models.CatAPTrue": + async def create_cat_ap_true(self, create_parameters: _models.CatAPTrue, **kwargs: Any) -> _models.CatAPTrue: """Create a CatAPTrue which contains more properties than what is defined. :param create_parameters: @@ -115,7 +115,7 @@ async def create_cat_ap_true(self, create_parameters: "_models.CatAPTrue", **kwa error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.CatAPTrue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.CatAPTrue] _json = self._serialize.body(create_parameters, "CatAPTrue") @@ -147,7 +147,7 @@ async def create_cat_ap_true(self, create_parameters: "_models.CatAPTrue", **kwa create_cat_ap_true.metadata = {"url": "/additionalProperties/true-subclass"} # type: ignore @distributed_trace_async - async def create_ap_object(self, create_parameters: "_models.PetAPObject", **kwargs: Any) -> "_models.PetAPObject": + async def create_ap_object(self, create_parameters: _models.PetAPObject, **kwargs: Any) -> _models.PetAPObject: """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -161,7 +161,7 @@ async def create_ap_object(self, create_parameters: "_models.PetAPObject", **kwa error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPObject"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPObject] _json = self._serialize.body(create_parameters, "PetAPObject") @@ -193,7 +193,7 @@ async def create_ap_object(self, create_parameters: "_models.PetAPObject", **kwa create_ap_object.metadata = {"url": "/additionalProperties/type/object"} # type: ignore @distributed_trace_async - async def create_ap_string(self, create_parameters: "_models.PetAPString", **kwargs: Any) -> "_models.PetAPString": + async def create_ap_string(self, create_parameters: _models.PetAPString, **kwargs: Any) -> _models.PetAPString: """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -207,7 +207,7 @@ async def create_ap_string(self, create_parameters: "_models.PetAPString", **kwa error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPString"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPString] _json = self._serialize.body(create_parameters, "PetAPString") @@ -240,8 +240,8 @@ async def create_ap_string(self, create_parameters: "_models.PetAPString", **kwa @distributed_trace_async async def create_ap_in_properties( - self, create_parameters: "_models.PetAPInProperties", **kwargs: Any - ) -> "_models.PetAPInProperties": + self, create_parameters: _models.PetAPInProperties, **kwargs: Any + ) -> _models.PetAPInProperties: """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -255,7 +255,7 @@ async def create_ap_in_properties( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPInProperties"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPInProperties] _json = self._serialize.body(create_parameters, "PetAPInProperties") @@ -288,8 +288,8 @@ async def create_ap_in_properties( @distributed_trace_async async def create_ap_in_properties_with_ap_string( - self, create_parameters: "_models.PetAPInPropertiesWithAPString", **kwargs: Any - ) -> "_models.PetAPInPropertiesWithAPString": + self, create_parameters: _models.PetAPInPropertiesWithAPString, **kwargs: Any + ) -> _models.PetAPInPropertiesWithAPString: """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -303,7 +303,7 @@ async def create_ap_in_properties_with_ap_string( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPInPropertiesWithAPString"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPInPropertiesWithAPString] _json = self._serialize.body(create_parameters, "PetAPInPropertiesWithAPString") diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py index a345a7db8b6..303b2405411 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py @@ -202,10 +202,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def create_ap_true( self, - create_parameters, # type: "_models.PetAPTrue" + create_parameters, # type: _models.PetAPTrue **kwargs # type: Any ): - # type: (...) -> "_models.PetAPTrue" + # type: (...) -> _models.PetAPTrue """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -219,7 +219,7 @@ def create_ap_true( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPTrue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPTrue] _json = self._serialize.body(create_parameters, "PetAPTrue") @@ -253,10 +253,10 @@ def create_ap_true( @distributed_trace def create_cat_ap_true( self, - create_parameters, # type: "_models.CatAPTrue" + create_parameters, # type: _models.CatAPTrue **kwargs # type: Any ): - # type: (...) -> "_models.CatAPTrue" + # type: (...) -> _models.CatAPTrue """Create a CatAPTrue which contains more properties than what is defined. :param create_parameters: @@ -270,7 +270,7 @@ def create_cat_ap_true( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.CatAPTrue"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.CatAPTrue] _json = self._serialize.body(create_parameters, "CatAPTrue") @@ -304,10 +304,10 @@ def create_cat_ap_true( @distributed_trace def create_ap_object( self, - create_parameters, # type: "_models.PetAPObject" + create_parameters, # type: _models.PetAPObject **kwargs # type: Any ): - # type: (...) -> "_models.PetAPObject" + # type: (...) -> _models.PetAPObject """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -321,7 +321,7 @@ def create_ap_object( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPObject"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPObject] _json = self._serialize.body(create_parameters, "PetAPObject") @@ -355,10 +355,10 @@ def create_ap_object( @distributed_trace def create_ap_string( self, - create_parameters, # type: "_models.PetAPString" + create_parameters, # type: _models.PetAPString **kwargs # type: Any ): - # type: (...) -> "_models.PetAPString" + # type: (...) -> _models.PetAPString """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -372,7 +372,7 @@ def create_ap_string( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPString"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPString] _json = self._serialize.body(create_parameters, "PetAPString") @@ -406,10 +406,10 @@ def create_ap_string( @distributed_trace def create_ap_in_properties( self, - create_parameters, # type: "_models.PetAPInProperties" + create_parameters, # type: _models.PetAPInProperties **kwargs # type: Any ): - # type: (...) -> "_models.PetAPInProperties" + # type: (...) -> _models.PetAPInProperties """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -423,7 +423,7 @@ def create_ap_in_properties( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPInProperties"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPInProperties] _json = self._serialize.body(create_parameters, "PetAPInProperties") @@ -457,10 +457,10 @@ def create_ap_in_properties( @distributed_trace def create_ap_in_properties_with_ap_string( self, - create_parameters, # type: "_models.PetAPInPropertiesWithAPString" + create_parameters, # type: _models.PetAPInPropertiesWithAPString **kwargs # type: Any ): - # type: (...) -> "_models.PetAPInPropertiesWithAPString" + # type: (...) -> _models.PetAPInPropertiesWithAPString """Create a Pet which contains more properties than what is defined. :param create_parameters: @@ -474,7 +474,7 @@ def create_ap_in_properties_with_ap_string( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAPInPropertiesWithAPString"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAPInPropertiesWithAPString] _json = self._serialize.body(create_parameters, "PetAPInPropertiesWithAPString") diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py index b609dbdcaf7..08a1ab743e7 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py @@ -2192,7 +2192,7 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: get_base64_url.metadata = {"url": "/array/prim/base64url/valid"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2203,7 +2203,7 @@ async def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -2231,7 +2231,7 @@ async def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_null.metadata = {"url": "/array/complex/null"} # 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 []. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2242,7 +2242,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -2270,7 +2270,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: get_complex_empty.metadata = {"url": "/array/complex/empty"} # 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'}]. @@ -2282,7 +2282,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -2310,7 +2310,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_item_null.metadata = {"url": "/array/complex/itemnull"} # 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'}]. @@ -2322,7 +2322,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -2350,7 +2350,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"] get_complex_item_empty.metadata = {"url": "/array/complex/itemempty"} # 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'}]. @@ -2362,7 +2362,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -2391,7 +2391,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: @distributed_trace_async async def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: List["_models.Product"], **kwargs: Any + self, array_body: List[_models.Product], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/models/_auto_rest_swagger_bat_array_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/models/_auto_rest_swagger_bat_array_service_enums.py index 9ad0742e428..28e05b36196 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/models/_auto_rest_swagger_bat_array_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/models/_auto_rest_swagger_bat_array_service_enums.py @@ -7,25 +7,24 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class Enum0(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Enum0(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" FOO3 = "foo3" -class Enum1(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Enum1(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" FOO3 = "foo3" -class FooEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class FooEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py index cafd65106bf..fa7c3bf14a6 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py @@ -3738,7 +3738,7 @@ def get_base64_url( def get_complex_null( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type null value. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3749,7 +3749,7 @@ def get_complex_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -3780,7 +3780,7 @@ def get_complex_null( def get_complex_empty( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get empty array of complex type []. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3791,7 +3791,7 @@ def get_complex_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -3822,7 +3822,7 @@ def get_complex_empty( def get_complex_item_null( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3834,7 +3834,7 @@ def get_complex_item_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -3865,7 +3865,7 @@ def get_complex_item_null( def get_complex_item_empty( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3877,7 +3877,7 @@ def get_complex_item_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -3908,7 +3908,7 @@ def get_complex_item_empty( def get_complex_valid( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3920,7 +3920,7 @@ def get_complex_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -3950,7 +3950,7 @@ def get_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements self, - array_body, # type: List["_models.Product"] + array_body, # type: List[_models.Product] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py index e71e93bb4f4..d0eece745ee 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py @@ -2192,7 +2192,7 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: get_base64_url.metadata = {"url": "/array/prim/base64url/valid"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2203,7 +2203,7 @@ async def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -2231,7 +2231,7 @@ async def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_null.metadata = {"url": "/array/complex/null"} # 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 []. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2242,7 +2242,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -2270,7 +2270,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: get_complex_empty.metadata = {"url": "/array/complex/empty"} # 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'}]. @@ -2282,7 +2282,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -2310,7 +2310,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_item_null.metadata = {"url": "/array/complex/itemnull"} # 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'}]. @@ -2322,7 +2322,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -2350,7 +2350,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"] get_complex_item_empty.metadata = {"url": "/array/complex/itemempty"} # 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'}]. @@ -2362,7 +2362,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -2391,7 +2391,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: @distributed_trace_async async def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: List["_models.Product"], **kwargs: Any + self, array_body: List[_models.Product], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/models/_auto_rest_swagger_bat_array_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/models/_auto_rest_swagger_bat_array_service_enums.py index 9ad0742e428..28e05b36196 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/models/_auto_rest_swagger_bat_array_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/models/_auto_rest_swagger_bat_array_service_enums.py @@ -7,25 +7,24 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class Enum0(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Enum0(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" FOO3 = "foo3" -class Enum1(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Enum1(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" FOO3 = "foo3" -class FooEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class FooEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py index bfe19878f83..b413faed368 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py @@ -3738,7 +3738,7 @@ def get_base64_url( def get_complex_null( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type null value. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3749,7 +3749,7 @@ def get_complex_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -3780,7 +3780,7 @@ def get_complex_null( def get_complex_empty( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get empty array of complex type []. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3791,7 +3791,7 @@ def get_complex_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -3822,7 +3822,7 @@ def get_complex_empty( def get_complex_item_null( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3834,7 +3834,7 @@ def get_complex_item_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -3865,7 +3865,7 @@ def get_complex_item_null( def get_complex_item_empty( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3877,7 +3877,7 @@ def get_complex_item_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -3908,7 +3908,7 @@ def get_complex_item_empty( def get_complex_valid( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3920,7 +3920,7 @@ def get_complex_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -3950,7 +3950,7 @@ def get_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements self, - array_body, # type: List["_models.Product"] + array_body, # type: List[_models.Product] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/aio/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/aio/operations/_array_operations.py index e66b864defc..d92d39011fe 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/aio/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/aio/operations/_array_operations.py @@ -2192,7 +2192,7 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: get_base64_url.metadata = {"url": "/array/prim/base64url/valid"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2203,7 +2203,7 @@ async def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -2231,7 +2231,7 @@ async def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_null.metadata = {"url": "/array/complex/null"} # 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 []. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2242,7 +2242,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -2270,7 +2270,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: get_complex_empty.metadata = {"url": "/array/complex/empty"} # 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'}]. @@ -2282,7 +2282,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -2310,7 +2310,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_item_null.metadata = {"url": "/array/complex/itemnull"} # 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'}]. @@ -2322,7 +2322,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"] error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -2350,7 +2350,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"] get_complex_item_empty.metadata = {"url": "/array/complex/itemempty"} # 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'}]. @@ -2362,7 +2362,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -2391,7 +2391,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: @distributed_trace_async async def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: List["_models.Product"], **kwargs: Any + self, array_body: List[_models.Product], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/models/_auto_rest_swagger_bat_array_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/models/_auto_rest_swagger_bat_array_service_enums.py index 9ad0742e428..28e05b36196 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/models/_auto_rest_swagger_bat_array_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/models/_auto_rest_swagger_bat_array_service_enums.py @@ -7,25 +7,24 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class Enum0(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Enum0(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" FOO3 = "foo3" -class Enum1(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Enum1(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" FOO3 = "foo3" -class FooEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class FooEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): FOO1 = "foo1" FOO2 = "foo2" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations.py index 58fe723faa1..41f00d5e3e4 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations.py @@ -3739,7 +3739,7 @@ def get_base64_url( def get_complex_null( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type null value. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3750,7 +3750,7 @@ def get_complex_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -3781,7 +3781,7 @@ def get_complex_null( def get_complex_empty( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get empty array of complex type []. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3792,7 +3792,7 @@ def get_complex_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -3823,7 +3823,7 @@ def get_complex_empty( def get_complex_item_null( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3835,7 +3835,7 @@ def get_complex_item_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -3866,7 +3866,7 @@ def get_complex_item_null( def get_complex_item_empty( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3878,7 +3878,7 @@ def get_complex_item_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -3909,7 +3909,7 @@ def get_complex_item_empty( def get_complex_valid( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Product"] + # type: (...) -> List[_models.Product] """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3921,7 +3921,7 @@ def get_complex_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -3951,7 +3951,7 @@ def get_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements self, - array_body, # type: List["_models.Product"] + array_body, # type: List[_models.Product] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations_py3.py index 9d5018f3a95..083ce63d715 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithPythonThreeOperationFiles/bodyarraywithpythonthreeoperationfiles/operations/_array_operations_py3.py @@ -3027,7 +3027,7 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: get_base64_url.metadata = {"url": "/array/prim/base64url/valid"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3038,7 +3038,7 @@ def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -3066,7 +3066,7 @@ def get_complex_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_null.metadata = {"url": "/array/complex/null"} # 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 []. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3077,7 +3077,7 @@ def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -3105,7 +3105,7 @@ def get_complex_empty(self, **kwargs: Any) -> List["_models.Product"]: get_complex_empty.metadata = {"url": "/array/complex/empty"} # 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'}]. @@ -3117,7 +3117,7 @@ def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -3145,7 +3145,7 @@ def get_complex_item_null(self, **kwargs: Any) -> List["_models.Product"]: get_complex_item_null.metadata = {"url": "/array/complex/itemnull"} # 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'}]. @@ -3157,7 +3157,7 @@ def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -3185,7 +3185,7 @@ def get_complex_item_empty(self, **kwargs: Any) -> List["_models.Product"]: get_complex_item_empty.metadata = {"url": "/array/complex/itemempty"} # 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'}]. @@ -3197,7 +3197,7 @@ def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Product"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Product]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -3226,7 +3226,7 @@ def get_complex_valid(self, **kwargs: Any) -> List["_models.Product"]: @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: List["_models.Product"], **kwargs: Any + self, array_body: List[_models.Product], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py index 3dec4bfdd1a..006d6bff112 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py @@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.ArrayWrapper": + async def get_valid(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -65,7 +65,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -138,7 +138,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/array/valid"} # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> "_models.ArrayWrapper": + async def get_empty(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -149,7 +149,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -222,7 +222,7 @@ async def put_empty( # pylint: disable=inconsistent-return-statements put_empty.metadata = {"url": "/complex/array/empty"} # type: ignore @distributed_trace_async - async def get_not_provided(self, **kwargs: Any) -> "_models.ArrayWrapper": + async def get_not_provided(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -233,7 +233,7 @@ async def get_not_provided(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py index abc46d73e21..900ecd16546 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py @@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Basic": + async def get_valid(self, **kwargs: Any) -> _models.Basic: """Get complex type {id: 2, name: 'abc', color: 'YELLOW'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -66,7 +66,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -95,7 +95,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Basic": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Basic", **kwargs: Any + self, complex_body: _models.Basic, **kwargs: Any ) -> None: """Please put {id: 2, name: 'abc', color: 'Magenta'}. @@ -140,7 +140,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/basic/valid"} # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> "_models.Basic": + async def get_invalid(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type that is invalid for the local strong type. :keyword callable cls: A custom type or function that will be passed the direct response @@ -151,7 +151,7 @@ async def get_invalid(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_invalid_request( template_url=self.get_invalid.metadata["url"], @@ -179,7 +179,7 @@ async def get_invalid(self, **kwargs: Any) -> "_models.Basic": get_invalid.metadata = {"url": "/complex/basic/invalid"} # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> "_models.Basic": + async def get_empty(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type that is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -190,7 +190,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -218,7 +218,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.Basic": get_empty.metadata = {"url": "/complex/basic/empty"} # type: ignore @distributed_trace_async - async def get_null(self, **kwargs: Any) -> "_models.Basic": + async def get_null(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type whose properties are null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -229,7 +229,7 @@ async def get_null(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -257,7 +257,7 @@ async def get_null(self, **kwargs: Any) -> "_models.Basic": get_null.metadata = {"url": "/complex/basic/null"} # type: ignore @distributed_trace_async - async def get_not_provided(self, **kwargs: Any) -> "_models.Basic": + async def get_not_provided(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type while the server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -268,7 +268,7 @@ async def get_not_provided(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py index 2d73fc33bc4..5c60528b04a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py @@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_valid(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -66,7 +66,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -139,7 +139,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/dictionary/typed/valid"} # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_empty(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -150,7 +150,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -223,7 +223,7 @@ async def put_empty( # pylint: disable=inconsistent-return-statements put_empty.metadata = {"url": "/complex/dictionary/typed/empty"} # type: ignore @distributed_trace_async - async def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_null(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property which is null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -234,7 +234,7 @@ async def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -262,7 +262,7 @@ async def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": get_null.metadata = {"url": "/complex/dictionary/typed/null"} # type: ignore @distributed_trace_async - async def get_not_provided(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_not_provided(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -273,7 +273,7 @@ async def get_not_provided(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py index 0b212954288..5f01eefd98d 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.MyBaseType": + async def get_valid(self, **kwargs: Any) -> _models.MyBaseType: """get_valid. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.MyBaseType": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyBaseType"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyBaseType] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py index 516111c1d03..1c9e61bed22 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Siamese": + async def get_valid(self, **kwargs: Any) -> _models.Siamese: """Get complex types that extend others. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Siamese": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Siamese"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Siamese] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -88,7 +88,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Siamese": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Siamese", **kwargs: Any + self, complex_body: _models.Siamese, **kwargs: Any ) -> None: """Put complex types that extend others. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py index a7e47a4ebc3..f1af0166a30 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Fish": + async def get_valid(self, **kwargs: Any) -> _models.Fish: """Get complex types that are polymorphic and have recursive references. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -88,7 +88,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic and have recursive references. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py index 778581c7e3a..8e3abdcf7e5 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py @@ -58,7 +58,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Fish": + async def get_valid(self, **kwargs: Any) -> _models.Fish: """Get complex types that are polymorphic. :keyword callable cls: A custom type or function that will be passed the direct response @@ -69,7 +69,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -98,7 +98,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic. @@ -173,7 +173,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/polymorphism/valid"} # type: ignore @distributed_trace_async - async def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": + async def get_dot_syntax(self, **kwargs: Any) -> _models.DotFish: """Get complex types that are polymorphic, JSON key contains a dot. :keyword callable cls: A custom type or function that will be passed the direct response @@ -184,7 +184,7 @@ async def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFish] request = build_get_dot_syntax_request( template_url=self.get_dot_syntax.metadata["url"], @@ -212,7 +212,7 @@ async def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": get_dot_syntax.metadata = {"url": "/complex/polymorphism/dotsyntax"} # type: ignore @distributed_trace_async - async def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFishMarket": + async def get_composed_with_discriminator(self, **kwargs: Any) -> _models.DotFishMarket: """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, with discriminator specified. Deserialization must NOT fail and use the discriminator type specified on the wire. @@ -225,7 +225,7 @@ async def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFi error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_with_discriminator_request( template_url=self.get_composed_with_discriminator.metadata["url"], @@ -253,7 +253,7 @@ async def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFi get_composed_with_discriminator.metadata = {"url": "/complex/polymorphism/composedWithDiscriminator"} # type: ignore @distributed_trace_async - async def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.DotFishMarket": + async def get_composed_without_discriminator(self, **kwargs: Any) -> _models.DotFishMarket: """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, without discriminator specified on wire. Deserialization must NOT fail and use the explicit type of the property. @@ -266,7 +266,7 @@ async def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.Do error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_without_discriminator_request( template_url=self.get_composed_without_discriminator.metadata["url"], @@ -294,7 +294,7 @@ async def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.Do get_composed_without_discriminator.metadata = {"url": "/complex/polymorphism/composedWithoutDiscriminator"} # type: ignore @distributed_trace_async - async def get_complicated(self, **kwargs: Any) -> "_models.Salmon": + async def get_complicated(self, **kwargs: Any) -> _models.Salmon: """Get complex types that are polymorphic, but not at the root of the hierarchy; also have additional properties. @@ -306,7 +306,7 @@ async def get_complicated(self, **kwargs: Any) -> "_models.Salmon": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] request = build_get_complicated_request( template_url=self.get_complicated.metadata["url"], @@ -335,7 +335,7 @@ async def get_complicated(self, **kwargs: Any) -> "_models.Salmon": @distributed_trace_async async def put_complicated( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Salmon", **kwargs: Any + self, complex_body: _models.Salmon, **kwargs: Any ) -> None: """Put complex types that are polymorphic, but not at the root of the hierarchy; also have additional properties. @@ -379,7 +379,7 @@ async def put_complicated( # pylint: disable=inconsistent-return-statements put_complicated.metadata = {"url": "/complex/polymorphism/complicated"} # type: ignore @distributed_trace_async - async def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwargs: Any) -> "_models.Salmon": + async def put_missing_discriminator(self, complex_body: _models.Salmon, **kwargs: Any) -> _models.Salmon: """Put complex types that are polymorphic, omitting the discriminator. :param complex_body: @@ -393,7 +393,7 @@ async def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwar error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] _json = self._serialize.body(complex_body, "Salmon") @@ -426,7 +426,7 @@ async def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwar @distributed_trace_async async def put_valid_missing_required( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic, attempting to omit required 'birthday' field - the request should not be allowed from the client. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py index 51a000fcd85..45036e9c9d4 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py @@ -72,7 +72,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_int(self, **kwargs: Any) -> "_models.IntWrapper": + async def get_int(self, **kwargs: Any) -> _models.IntWrapper: """Get complex types with integer properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -83,7 +83,7 @@ async def get_int(self, **kwargs: Any) -> "_models.IntWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.IntWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.IntWrapper] request = build_get_int_request( template_url=self.get_int.metadata["url"], @@ -112,7 +112,7 @@ async def get_int(self, **kwargs: Any) -> "_models.IntWrapper": @distributed_trace_async async def put_int( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.IntWrapper", **kwargs: Any + self, complex_body: _models.IntWrapper, **kwargs: Any ) -> None: """Put complex types with integer properties. @@ -155,7 +155,7 @@ async def put_int( # pylint: disable=inconsistent-return-statements put_int.metadata = {"url": "/complex/primitive/integer"} # type: ignore @distributed_trace_async - async def get_long(self, **kwargs: Any) -> "_models.LongWrapper": + async def get_long(self, **kwargs: Any) -> _models.LongWrapper: """Get complex types with long properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -166,7 +166,7 @@ async def get_long(self, **kwargs: Any) -> "_models.LongWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.LongWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LongWrapper] request = build_get_long_request( template_url=self.get_long.metadata["url"], @@ -195,7 +195,7 @@ async def get_long(self, **kwargs: Any) -> "_models.LongWrapper": @distributed_trace_async async def put_long( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.LongWrapper", **kwargs: Any + self, complex_body: _models.LongWrapper, **kwargs: Any ) -> None: """Put complex types with long properties. @@ -238,7 +238,7 @@ async def put_long( # pylint: disable=inconsistent-return-statements put_long.metadata = {"url": "/complex/primitive/long"} # type: ignore @distributed_trace_async - async def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": + async def get_float(self, **kwargs: Any) -> _models.FloatWrapper: """Get complex types with float properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -249,7 +249,7 @@ async def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.FloatWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.FloatWrapper] request = build_get_float_request( template_url=self.get_float.metadata["url"], @@ -278,7 +278,7 @@ async def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": @distributed_trace_async async def put_float( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.FloatWrapper", **kwargs: Any + self, complex_body: _models.FloatWrapper, **kwargs: Any ) -> None: """Put complex types with float properties. @@ -321,7 +321,7 @@ async def put_float( # pylint: disable=inconsistent-return-statements put_float.metadata = {"url": "/complex/primitive/float"} # type: ignore @distributed_trace_async - async def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": + async def get_double(self, **kwargs: Any) -> _models.DoubleWrapper: """Get complex types with double properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -332,7 +332,7 @@ async def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DoubleWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DoubleWrapper] request = build_get_double_request( template_url=self.get_double.metadata["url"], @@ -361,7 +361,7 @@ async def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": @distributed_trace_async async def put_double( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DoubleWrapper", **kwargs: Any + self, complex_body: _models.DoubleWrapper, **kwargs: Any ) -> None: """Put complex types with double properties. @@ -405,7 +405,7 @@ async def put_double( # pylint: disable=inconsistent-return-statements put_double.metadata = {"url": "/complex/primitive/double"} # type: ignore @distributed_trace_async - async def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": + async def get_bool(self, **kwargs: Any) -> _models.BooleanWrapper: """Get complex types with bool properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -416,7 +416,7 @@ async def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.BooleanWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.BooleanWrapper] request = build_get_bool_request( template_url=self.get_bool.metadata["url"], @@ -445,7 +445,7 @@ async def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": @distributed_trace_async async def put_bool( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.BooleanWrapper", **kwargs: Any + self, complex_body: _models.BooleanWrapper, **kwargs: Any ) -> None: """Put complex types with bool properties. @@ -488,7 +488,7 @@ async def put_bool( # pylint: disable=inconsistent-return-statements put_bool.metadata = {"url": "/complex/primitive/bool"} # type: ignore @distributed_trace_async - async def get_string(self, **kwargs: Any) -> "_models.StringWrapper": + async def get_string(self, **kwargs: Any) -> _models.StringWrapper: """Get complex types with string properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -499,7 +499,7 @@ async def get_string(self, **kwargs: Any) -> "_models.StringWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.StringWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StringWrapper] request = build_get_string_request( template_url=self.get_string.metadata["url"], @@ -528,7 +528,7 @@ async def get_string(self, **kwargs: Any) -> "_models.StringWrapper": @distributed_trace_async async def put_string( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.StringWrapper", **kwargs: Any + self, complex_body: _models.StringWrapper, **kwargs: Any ) -> None: """Put complex types with string properties. @@ -571,7 +571,7 @@ async def put_string( # pylint: disable=inconsistent-return-statements put_string.metadata = {"url": "/complex/primitive/string"} # type: ignore @distributed_trace_async - async def get_date(self, **kwargs: Any) -> "_models.DateWrapper": + async def get_date(self, **kwargs: Any) -> _models.DateWrapper: """Get complex types with date properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -582,7 +582,7 @@ async def get_date(self, **kwargs: Any) -> "_models.DateWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DateWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DateWrapper] request = build_get_date_request( template_url=self.get_date.metadata["url"], @@ -611,7 +611,7 @@ async def get_date(self, **kwargs: Any) -> "_models.DateWrapper": @distributed_trace_async async def put_date( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DateWrapper", **kwargs: Any + self, complex_body: _models.DateWrapper, **kwargs: Any ) -> None: """Put complex types with date properties. @@ -654,7 +654,7 @@ async def put_date( # pylint: disable=inconsistent-return-statements put_date.metadata = {"url": "/complex/primitive/date"} # type: ignore @distributed_trace_async - async def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": + async def get_date_time(self, **kwargs: Any) -> _models.DatetimeWrapper: """Get complex types with datetime properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -665,7 +665,7 @@ async def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DatetimeWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DatetimeWrapper] request = build_get_date_time_request( template_url=self.get_date_time.metadata["url"], @@ -694,7 +694,7 @@ async def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": @distributed_trace_async async def put_date_time( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DatetimeWrapper", **kwargs: Any + self, complex_body: _models.DatetimeWrapper, **kwargs: Any ) -> None: """Put complex types with datetime properties. @@ -737,7 +737,7 @@ async def put_date_time( # pylint: disable=inconsistent-return-statements put_date_time.metadata = {"url": "/complex/primitive/datetime"} # type: ignore @distributed_trace_async - async def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123Wrapper": + async def get_date_time_rfc1123(self, **kwargs: Any) -> _models.Datetimerfc1123Wrapper: """Get complex types with datetimeRfc1123 properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -748,7 +748,7 @@ async def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123 error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Datetimerfc1123Wrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Datetimerfc1123Wrapper] request = build_get_date_time_rfc1123_request( template_url=self.get_date_time_rfc1123.metadata["url"], @@ -777,7 +777,7 @@ async def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123 @distributed_trace_async async def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Datetimerfc1123Wrapper", **kwargs: Any + self, complex_body: _models.Datetimerfc1123Wrapper, **kwargs: Any ) -> None: """Put complex types with datetimeRfc1123 properties. @@ -821,7 +821,7 @@ async def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statemen put_date_time_rfc1123.metadata = {"url": "/complex/primitive/datetimerfc1123"} # type: ignore @distributed_trace_async - async def get_duration(self, **kwargs: Any) -> "_models.DurationWrapper": + async def get_duration(self, **kwargs: Any) -> _models.DurationWrapper: """Get complex types with duration properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -832,7 +832,7 @@ async def get_duration(self, **kwargs: Any) -> "_models.DurationWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DurationWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DurationWrapper] request = build_get_duration_request( template_url=self.get_duration.metadata["url"], @@ -905,7 +905,7 @@ async def put_duration( # pylint: disable=inconsistent-return-statements put_duration.metadata = {"url": "/complex/primitive/duration"} # type: ignore @distributed_trace_async - async def get_byte(self, **kwargs: Any) -> "_models.ByteWrapper": + async def get_byte(self, **kwargs: Any) -> _models.ByteWrapper: """Get complex types with byte properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -916,7 +916,7 @@ async def get_byte(self, **kwargs: Any) -> "_models.ByteWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ByteWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ByteWrapper] request = build_get_byte_request( template_url=self.get_byte.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py index db2c217414d..ec15fac62a3 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.ReadonlyObj": + async def get_valid(self, **kwargs: Any) -> _models.ReadonlyObj: """Get complex types that have readonly properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.ReadonlyObj": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ReadonlyObj"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ReadonlyObj] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py index dd6d79768e0..893c9c9f88f 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_auto_rest_complex_test_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class CMYKColors(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class CMYKColors(str, Enum, metaclass=CaseInsensitiveEnumMeta): CYAN = "cyan" MAGENTA = "Magenta" @@ -19,7 +18,7 @@ class CMYKColors(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): BLAC_K = "blacK" -class GoblinSharkColor(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class GoblinSharkColor(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Colors possible""" PINK = "pink" @@ -31,6 +30,6 @@ class GoblinSharkColor(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): LOWER_RED = "red" -class MyKind(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class MyKind(str, Enum, metaclass=CaseInsensitiveEnumMeta): KIND1 = "Kind1" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py index 92a13b5668d..9653b362762 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py @@ -12,8 +12,6 @@ from azure.core.exceptions import HttpResponseError import msrest.serialization -from ._auto_rest_complex_test_service_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py index 2f766da373b..cafce35f5e9 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py @@ -166,7 +166,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.ArrayWrapper" + # type: (...) -> _models.ArrayWrapper """Get complex types with array property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -177,7 +177,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -256,7 +256,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements def get_empty( self, **kwargs # type: Any ): - # type: (...) -> "_models.ArrayWrapper" + # type: (...) -> _models.ArrayWrapper """Get complex types with array property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -267,7 +267,7 @@ def get_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -346,7 +346,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements def get_not_provided( self, **kwargs # type: Any ): - # type: (...) -> "_models.ArrayWrapper" + # type: (...) -> _models.ArrayWrapper """Get complex types with array property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -357,7 +357,7 @@ def get_not_provided( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py index 37a15c3a43a..d4a76882e08 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py @@ -188,7 +188,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.Basic" + # type: (...) -> _models.Basic """Get complex type {id: 2, name: 'abc', color: 'YELLOW'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -199,7 +199,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -229,7 +229,7 @@ def get_valid( @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.Basic" + complex_body, # type: _models.Basic **kwargs # type: Any ): # type: (...) -> None @@ -279,7 +279,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements def get_invalid( self, **kwargs # type: Any ): - # type: (...) -> "_models.Basic" + # type: (...) -> _models.Basic """Get a basic complex type that is invalid for the local strong type. :keyword callable cls: A custom type or function that will be passed the direct response @@ -290,7 +290,7 @@ def get_invalid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_invalid_request( template_url=self.get_invalid.metadata["url"], @@ -321,7 +321,7 @@ def get_invalid( def get_empty( self, **kwargs # type: Any ): - # type: (...) -> "_models.Basic" + # type: (...) -> _models.Basic """Get a basic complex type that is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -332,7 +332,7 @@ def get_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -363,7 +363,7 @@ def get_empty( def get_null( self, **kwargs # type: Any ): - # type: (...) -> "_models.Basic" + # type: (...) -> _models.Basic """Get a basic complex type whose properties are null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -374,7 +374,7 @@ def get_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -405,7 +405,7 @@ def get_null( def get_not_provided( self, **kwargs # type: Any ): - # type: (...) -> "_models.Basic" + # type: (...) -> _models.Basic """Get a basic complex type while the server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -416,7 +416,7 @@ def get_not_provided( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py index 80d1abf7171..0572a904b16 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py @@ -186,7 +186,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.DictionaryWrapper" + # type: (...) -> _models.DictionaryWrapper """Get complex types with dictionary property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -197,7 +197,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -276,7 +276,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements def get_empty( self, **kwargs # type: Any ): - # type: (...) -> "_models.DictionaryWrapper" + # type: (...) -> _models.DictionaryWrapper """Get complex types with dictionary property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -287,7 +287,7 @@ def get_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -366,7 +366,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements def get_null( self, **kwargs # type: Any ): - # type: (...) -> "_models.DictionaryWrapper" + # type: (...) -> _models.DictionaryWrapper """Get complex types with dictionary property which is null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -377,7 +377,7 @@ def get_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -408,7 +408,7 @@ def get_null( def get_not_provided( self, **kwargs # type: Any ): - # type: (...) -> "_models.DictionaryWrapper" + # type: (...) -> _models.DictionaryWrapper """Get complex types with dictionary property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -419,7 +419,7 @@ def get_not_provided( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py index f71ab9abe96..eb039e7e9c4 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py @@ -78,7 +78,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyBaseType" + # type: (...) -> _models.MyBaseType """get_valid. :keyword callable cls: A custom type or function that will be passed the direct response @@ -89,7 +89,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyBaseType"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyBaseType] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py index 85d07420cae..782947089f4 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py @@ -102,7 +102,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.Siamese" + # type: (...) -> _models.Siamese """Get complex types that extend others. :keyword callable cls: A custom type or function that will be passed the direct response @@ -113,7 +113,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Siamese"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Siamese] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -143,7 +143,7 @@ def get_valid( @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.Siamese" + complex_body, # type: _models.Siamese **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py index 37301bf1e04..8fc9656aa19 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py @@ -102,7 +102,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.Fish" + # type: (...) -> _models.Fish """Get complex types that are polymorphic and have recursive references. :keyword callable cls: A custom type or function that will be passed the direct response @@ -113,7 +113,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -143,7 +143,7 @@ def get_valid( @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.Fish" + complex_body, # type: _models.Fish **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py index b337f7467bb..693b440e95e 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py @@ -254,7 +254,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.Fish" + # type: (...) -> _models.Fish """Get complex types that are polymorphic. :keyword callable cls: A custom type or function that will be passed the direct response @@ -265,7 +265,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -295,7 +295,7 @@ def get_valid( @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.Fish" + complex_body, # type: _models.Fish **kwargs # type: Any ): # type: (...) -> None @@ -375,7 +375,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements def get_dot_syntax( self, **kwargs # type: Any ): - # type: (...) -> "_models.DotFish" + # type: (...) -> _models.DotFish """Get complex types that are polymorphic, JSON key contains a dot. :keyword callable cls: A custom type or function that will be passed the direct response @@ -386,7 +386,7 @@ def get_dot_syntax( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFish] request = build_get_dot_syntax_request( template_url=self.get_dot_syntax.metadata["url"], @@ -417,7 +417,7 @@ def get_dot_syntax( def get_composed_with_discriminator( self, **kwargs # type: Any ): - # type: (...) -> "_models.DotFishMarket" + # type: (...) -> _models.DotFishMarket """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, with discriminator specified. Deserialization must NOT fail and use the discriminator type specified on the wire. @@ -430,7 +430,7 @@ def get_composed_with_discriminator( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_with_discriminator_request( template_url=self.get_composed_with_discriminator.metadata["url"], @@ -461,7 +461,7 @@ def get_composed_with_discriminator( def get_composed_without_discriminator( self, **kwargs # type: Any ): - # type: (...) -> "_models.DotFishMarket" + # type: (...) -> _models.DotFishMarket """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, without discriminator specified on wire. Deserialization must NOT fail and use the explicit type of the property. @@ -474,7 +474,7 @@ def get_composed_without_discriminator( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_without_discriminator_request( template_url=self.get_composed_without_discriminator.metadata["url"], @@ -505,7 +505,7 @@ def get_composed_without_discriminator( def get_complicated( self, **kwargs # type: Any ): - # type: (...) -> "_models.Salmon" + # type: (...) -> _models.Salmon """Get complex types that are polymorphic, but not at the root of the hierarchy; also have additional properties. @@ -517,7 +517,7 @@ def get_complicated( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] request = build_get_complicated_request( template_url=self.get_complicated.metadata["url"], @@ -547,7 +547,7 @@ def get_complicated( @distributed_trace def put_complicated( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.Salmon" + complex_body, # type: _models.Salmon **kwargs # type: Any ): # type: (...) -> None @@ -595,10 +595,10 @@ def put_complicated( # pylint: disable=inconsistent-return-statements @distributed_trace def put_missing_discriminator( self, - complex_body, # type: "_models.Salmon" + complex_body, # type: _models.Salmon **kwargs # type: Any ): - # type: (...) -> "_models.Salmon" + # type: (...) -> _models.Salmon """Put complex types that are polymorphic, omitting the discriminator. :param complex_body: @@ -612,7 +612,7 @@ def put_missing_discriminator( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] _json = self._serialize.body(complex_body, "Salmon") @@ -646,7 +646,7 @@ def put_missing_discriminator( @distributed_trace def put_valid_missing_required( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.Fish" + complex_body, # type: _models.Fish **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py index 095a237022d..86d6ab09af3 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py @@ -543,7 +543,7 @@ def __init__(self, *args, **kwargs): def get_int( self, **kwargs # type: Any ): - # type: (...) -> "_models.IntWrapper" + # type: (...) -> _models.IntWrapper """Get complex types with integer properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -554,7 +554,7 @@ def get_int( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.IntWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.IntWrapper] request = build_get_int_request( template_url=self.get_int.metadata["url"], @@ -584,7 +584,7 @@ def get_int( @distributed_trace def put_int( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.IntWrapper" + complex_body, # type: _models.IntWrapper **kwargs # type: Any ): # type: (...) -> None @@ -632,7 +632,7 @@ def put_int( # pylint: disable=inconsistent-return-statements def get_long( self, **kwargs # type: Any ): - # type: (...) -> "_models.LongWrapper" + # type: (...) -> _models.LongWrapper """Get complex types with long properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -643,7 +643,7 @@ def get_long( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.LongWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LongWrapper] request = build_get_long_request( template_url=self.get_long.metadata["url"], @@ -673,7 +673,7 @@ def get_long( @distributed_trace def put_long( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.LongWrapper" + complex_body, # type: _models.LongWrapper **kwargs # type: Any ): # type: (...) -> None @@ -721,7 +721,7 @@ def put_long( # pylint: disable=inconsistent-return-statements def get_float( self, **kwargs # type: Any ): - # type: (...) -> "_models.FloatWrapper" + # type: (...) -> _models.FloatWrapper """Get complex types with float properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -732,7 +732,7 @@ def get_float( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.FloatWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.FloatWrapper] request = build_get_float_request( template_url=self.get_float.metadata["url"], @@ -762,7 +762,7 @@ def get_float( @distributed_trace def put_float( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.FloatWrapper" + complex_body, # type: _models.FloatWrapper **kwargs # type: Any ): # type: (...) -> None @@ -810,7 +810,7 @@ def put_float( # pylint: disable=inconsistent-return-statements def get_double( self, **kwargs # type: Any ): - # type: (...) -> "_models.DoubleWrapper" + # type: (...) -> _models.DoubleWrapper """Get complex types with double properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -821,7 +821,7 @@ def get_double( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DoubleWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DoubleWrapper] request = build_get_double_request( template_url=self.get_double.metadata["url"], @@ -851,7 +851,7 @@ def get_double( @distributed_trace def put_double( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.DoubleWrapper" + complex_body, # type: _models.DoubleWrapper **kwargs # type: Any ): # type: (...) -> None @@ -900,7 +900,7 @@ def put_double( # pylint: disable=inconsistent-return-statements def get_bool( self, **kwargs # type: Any ): - # type: (...) -> "_models.BooleanWrapper" + # type: (...) -> _models.BooleanWrapper """Get complex types with bool properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -911,7 +911,7 @@ def get_bool( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.BooleanWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.BooleanWrapper] request = build_get_bool_request( template_url=self.get_bool.metadata["url"], @@ -941,7 +941,7 @@ def get_bool( @distributed_trace def put_bool( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.BooleanWrapper" + complex_body, # type: _models.BooleanWrapper **kwargs # type: Any ): # type: (...) -> None @@ -989,7 +989,7 @@ def put_bool( # pylint: disable=inconsistent-return-statements def get_string( self, **kwargs # type: Any ): - # type: (...) -> "_models.StringWrapper" + # type: (...) -> _models.StringWrapper """Get complex types with string properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1000,7 +1000,7 @@ def get_string( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.StringWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StringWrapper] request = build_get_string_request( template_url=self.get_string.metadata["url"], @@ -1030,7 +1030,7 @@ def get_string( @distributed_trace def put_string( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.StringWrapper" + complex_body, # type: _models.StringWrapper **kwargs # type: Any ): # type: (...) -> None @@ -1078,7 +1078,7 @@ def put_string( # pylint: disable=inconsistent-return-statements def get_date( self, **kwargs # type: Any ): - # type: (...) -> "_models.DateWrapper" + # type: (...) -> _models.DateWrapper """Get complex types with date properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1089,7 +1089,7 @@ def get_date( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DateWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DateWrapper] request = build_get_date_request( template_url=self.get_date.metadata["url"], @@ -1119,7 +1119,7 @@ def get_date( @distributed_trace def put_date( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.DateWrapper" + complex_body, # type: _models.DateWrapper **kwargs # type: Any ): # type: (...) -> None @@ -1167,7 +1167,7 @@ def put_date( # pylint: disable=inconsistent-return-statements def get_date_time( self, **kwargs # type: Any ): - # type: (...) -> "_models.DatetimeWrapper" + # type: (...) -> _models.DatetimeWrapper """Get complex types with datetime properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1178,7 +1178,7 @@ def get_date_time( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DatetimeWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DatetimeWrapper] request = build_get_date_time_request( template_url=self.get_date_time.metadata["url"], @@ -1208,7 +1208,7 @@ def get_date_time( @distributed_trace def put_date_time( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.DatetimeWrapper" + complex_body, # type: _models.DatetimeWrapper **kwargs # type: Any ): # type: (...) -> None @@ -1256,7 +1256,7 @@ def put_date_time( # pylint: disable=inconsistent-return-statements def get_date_time_rfc1123( self, **kwargs # type: Any ): - # type: (...) -> "_models.Datetimerfc1123Wrapper" + # type: (...) -> _models.Datetimerfc1123Wrapper """Get complex types with datetimeRfc1123 properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1267,7 +1267,7 @@ def get_date_time_rfc1123( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Datetimerfc1123Wrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Datetimerfc1123Wrapper] request = build_get_date_time_rfc1123_request( template_url=self.get_date_time_rfc1123.metadata["url"], @@ -1297,7 +1297,7 @@ def get_date_time_rfc1123( @distributed_trace def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements self, - complex_body, # type: "_models.Datetimerfc1123Wrapper" + complex_body, # type: _models.Datetimerfc1123Wrapper **kwargs # type: Any ): # type: (...) -> None @@ -1346,7 +1346,7 @@ def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements def get_duration( self, **kwargs # type: Any ): - # type: (...) -> "_models.DurationWrapper" + # type: (...) -> _models.DurationWrapper """Get complex types with duration properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1357,7 +1357,7 @@ def get_duration( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DurationWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DurationWrapper] request = build_get_duration_request( template_url=self.get_duration.metadata["url"], @@ -1436,7 +1436,7 @@ def put_duration( # pylint: disable=inconsistent-return-statements def get_byte( self, **kwargs # type: Any ): - # type: (...) -> "_models.ByteWrapper" + # type: (...) -> _models.ByteWrapper """Get complex types with byte properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1447,7 +1447,7 @@ def get_byte( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ByteWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ByteWrapper] request = build_get_byte_request( template_url=self.get_byte.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py index 092ab9fe1d0..61eabc0b756 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py @@ -102,7 +102,7 @@ def __init__(self, *args, **kwargs): def get_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.ReadonlyObj" + # type: (...) -> _models.ReadonlyObj """Get complex types that have readonly properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -113,7 +113,7 @@ def get_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ReadonlyObj"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ReadonlyObj] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_array_operations.py index 97f3134ae6e..83414126573 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_array_operations.py @@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.ArrayWrapper": + async def get_valid(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -65,7 +65,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -138,7 +138,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/array/valid"} # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> "_models.ArrayWrapper": + async def get_empty(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -149,7 +149,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -222,7 +222,7 @@ async def put_empty( # pylint: disable=inconsistent-return-statements put_empty.metadata = {"url": "/complex/array/empty"} # type: ignore @distributed_trace_async - async def get_not_provided(self, **kwargs: Any) -> "_models.ArrayWrapper": + async def get_not_provided(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -233,7 +233,7 @@ async def get_not_provided(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_basic_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_basic_operations.py index 8503de0fc45..e91e2ec80a3 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_basic_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_basic_operations.py @@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Basic": + async def get_valid(self, **kwargs: Any) -> _models.Basic: """Get complex type {id: 2, name: 'abc', color: 'YELLOW'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -66,7 +66,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -95,7 +95,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Basic": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Basic", **kwargs: Any + self, complex_body: _models.Basic, **kwargs: Any ) -> None: """Please put {id: 2, name: 'abc', color: 'Magenta'}. @@ -140,7 +140,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/basic/valid"} # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> "_models.Basic": + async def get_invalid(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type that is invalid for the local strong type. :keyword callable cls: A custom type or function that will be passed the direct response @@ -151,7 +151,7 @@ async def get_invalid(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_invalid_request( template_url=self.get_invalid.metadata["url"], @@ -179,7 +179,7 @@ async def get_invalid(self, **kwargs: Any) -> "_models.Basic": get_invalid.metadata = {"url": "/complex/basic/invalid"} # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> "_models.Basic": + async def get_empty(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type that is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -190,7 +190,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -218,7 +218,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.Basic": get_empty.metadata = {"url": "/complex/basic/empty"} # type: ignore @distributed_trace_async - async def get_null(self, **kwargs: Any) -> "_models.Basic": + async def get_null(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type whose properties are null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -229,7 +229,7 @@ async def get_null(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -257,7 +257,7 @@ async def get_null(self, **kwargs: Any) -> "_models.Basic": get_null.metadata = {"url": "/complex/basic/null"} # type: ignore @distributed_trace_async - async def get_not_provided(self, **kwargs: Any) -> "_models.Basic": + async def get_not_provided(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type while the server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -268,7 +268,7 @@ async def get_not_provided(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_dictionary_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_dictionary_operations.py index c1fd825c750..60cc70dd6d7 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_dictionary_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_dictionary_operations.py @@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_valid(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -66,7 +66,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -139,7 +139,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/dictionary/typed/valid"} # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_empty(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -150,7 +150,7 @@ async def get_empty(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -223,7 +223,7 @@ async def put_empty( # pylint: disable=inconsistent-return-statements put_empty.metadata = {"url": "/complex/dictionary/typed/empty"} # type: ignore @distributed_trace_async - async def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_null(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property which is null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -234,7 +234,7 @@ async def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -262,7 +262,7 @@ async def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": get_null.metadata = {"url": "/complex/dictionary/typed/null"} # type: ignore @distributed_trace_async - async def get_not_provided(self, **kwargs: Any) -> "_models.DictionaryWrapper": + async def get_not_provided(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -273,7 +273,7 @@ async def get_not_provided(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_flattencomplex_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_flattencomplex_operations.py index c963c80069a..03e7ab2816e 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_flattencomplex_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_flattencomplex_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.MyBaseType": + async def get_valid(self, **kwargs: Any) -> _models.MyBaseType: """get_valid. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.MyBaseType": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyBaseType"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyBaseType] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_inheritance_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_inheritance_operations.py index c9b49695662..1aaffe40edb 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_inheritance_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_inheritance_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Siamese": + async def get_valid(self, **kwargs: Any) -> _models.Siamese: """Get complex types that extend others. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Siamese": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Siamese"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Siamese] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -88,7 +88,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Siamese": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Siamese", **kwargs: Any + self, complex_body: _models.Siamese, **kwargs: Any ) -> None: """Put complex types that extend others. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphicrecursive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphicrecursive_operations.py index 28df3144c01..a4222a3248b 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphicrecursive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphicrecursive_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Fish": + async def get_valid(self, **kwargs: Any) -> _models.Fish: """Get complex types that are polymorphic and have recursive references. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -88,7 +88,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic and have recursive references. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphism_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphism_operations.py index eb58680604a..fe914602fcd 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphism_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_polymorphism_operations.py @@ -58,7 +58,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.Fish": + async def get_valid(self, **kwargs: Any) -> _models.Fish: """Get complex types that are polymorphic. :keyword callable cls: A custom type or function that will be passed the direct response @@ -69,7 +69,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -98,7 +98,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.Fish": @distributed_trace_async async def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic. @@ -173,7 +173,7 @@ async def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/polymorphism/valid"} # type: ignore @distributed_trace_async - async def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": + async def get_dot_syntax(self, **kwargs: Any) -> _models.DotFish: """Get complex types that are polymorphic, JSON key contains a dot. :keyword callable cls: A custom type or function that will be passed the direct response @@ -184,7 +184,7 @@ async def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFish] request = build_get_dot_syntax_request( template_url=self.get_dot_syntax.metadata["url"], @@ -212,7 +212,7 @@ async def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": get_dot_syntax.metadata = {"url": "/complex/polymorphism/dotsyntax"} # type: ignore @distributed_trace_async - async def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFishMarket": + async def get_composed_with_discriminator(self, **kwargs: Any) -> _models.DotFishMarket: """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, with discriminator specified. Deserialization must NOT fail and use the discriminator type specified on the wire. @@ -225,7 +225,7 @@ async def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFi error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_with_discriminator_request( template_url=self.get_composed_with_discriminator.metadata["url"], @@ -253,7 +253,7 @@ async def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFi get_composed_with_discriminator.metadata = {"url": "/complex/polymorphism/composedWithDiscriminator"} # type: ignore @distributed_trace_async - async def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.DotFishMarket": + async def get_composed_without_discriminator(self, **kwargs: Any) -> _models.DotFishMarket: """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, without discriminator specified on wire. Deserialization must NOT fail and use the explicit type of the property. @@ -266,7 +266,7 @@ async def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.Do error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_without_discriminator_request( template_url=self.get_composed_without_discriminator.metadata["url"], @@ -294,7 +294,7 @@ async def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.Do get_composed_without_discriminator.metadata = {"url": "/complex/polymorphism/composedWithoutDiscriminator"} # type: ignore @distributed_trace_async - async def get_complicated(self, **kwargs: Any) -> "_models.Salmon": + async def get_complicated(self, **kwargs: Any) -> _models.Salmon: """Get complex types that are polymorphic, but not at the root of the hierarchy; also have additional properties. @@ -306,7 +306,7 @@ async def get_complicated(self, **kwargs: Any) -> "_models.Salmon": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] request = build_get_complicated_request( template_url=self.get_complicated.metadata["url"], @@ -335,7 +335,7 @@ async def get_complicated(self, **kwargs: Any) -> "_models.Salmon": @distributed_trace_async async def put_complicated( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Salmon", **kwargs: Any + self, complex_body: _models.Salmon, **kwargs: Any ) -> None: """Put complex types that are polymorphic, but not at the root of the hierarchy; also have additional properties. @@ -379,7 +379,7 @@ async def put_complicated( # pylint: disable=inconsistent-return-statements put_complicated.metadata = {"url": "/complex/polymorphism/complicated"} # type: ignore @distributed_trace_async - async def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwargs: Any) -> "_models.Salmon": + async def put_missing_discriminator(self, complex_body: _models.Salmon, **kwargs: Any) -> _models.Salmon: """Put complex types that are polymorphic, omitting the discriminator. :param complex_body: @@ -393,7 +393,7 @@ async def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwar error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] _json = self._serialize.body(complex_body, "Salmon") @@ -426,7 +426,7 @@ async def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwar @distributed_trace_async async def put_valid_missing_required( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic, attempting to omit required 'birthday' field - the request should not be allowed from the client. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_primitive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_primitive_operations.py index a0087fd904f..17bef5b70ec 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_primitive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_primitive_operations.py @@ -72,7 +72,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_int(self, **kwargs: Any) -> "_models.IntWrapper": + async def get_int(self, **kwargs: Any) -> _models.IntWrapper: """Get complex types with integer properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -83,7 +83,7 @@ async def get_int(self, **kwargs: Any) -> "_models.IntWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.IntWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.IntWrapper] request = build_get_int_request( template_url=self.get_int.metadata["url"], @@ -112,7 +112,7 @@ async def get_int(self, **kwargs: Any) -> "_models.IntWrapper": @distributed_trace_async async def put_int( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.IntWrapper", **kwargs: Any + self, complex_body: _models.IntWrapper, **kwargs: Any ) -> None: """Put complex types with integer properties. @@ -155,7 +155,7 @@ async def put_int( # pylint: disable=inconsistent-return-statements put_int.metadata = {"url": "/complex/primitive/integer"} # type: ignore @distributed_trace_async - async def get_long(self, **kwargs: Any) -> "_models.LongWrapper": + async def get_long(self, **kwargs: Any) -> _models.LongWrapper: """Get complex types with long properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -166,7 +166,7 @@ async def get_long(self, **kwargs: Any) -> "_models.LongWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.LongWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LongWrapper] request = build_get_long_request( template_url=self.get_long.metadata["url"], @@ -195,7 +195,7 @@ async def get_long(self, **kwargs: Any) -> "_models.LongWrapper": @distributed_trace_async async def put_long( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.LongWrapper", **kwargs: Any + self, complex_body: _models.LongWrapper, **kwargs: Any ) -> None: """Put complex types with long properties. @@ -238,7 +238,7 @@ async def put_long( # pylint: disable=inconsistent-return-statements put_long.metadata = {"url": "/complex/primitive/long"} # type: ignore @distributed_trace_async - async def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": + async def get_float(self, **kwargs: Any) -> _models.FloatWrapper: """Get complex types with float properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -249,7 +249,7 @@ async def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.FloatWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.FloatWrapper] request = build_get_float_request( template_url=self.get_float.metadata["url"], @@ -278,7 +278,7 @@ async def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": @distributed_trace_async async def put_float( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.FloatWrapper", **kwargs: Any + self, complex_body: _models.FloatWrapper, **kwargs: Any ) -> None: """Put complex types with float properties. @@ -321,7 +321,7 @@ async def put_float( # pylint: disable=inconsistent-return-statements put_float.metadata = {"url": "/complex/primitive/float"} # type: ignore @distributed_trace_async - async def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": + async def get_double(self, **kwargs: Any) -> _models.DoubleWrapper: """Get complex types with double properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -332,7 +332,7 @@ async def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DoubleWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DoubleWrapper] request = build_get_double_request( template_url=self.get_double.metadata["url"], @@ -361,7 +361,7 @@ async def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": @distributed_trace_async async def put_double( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DoubleWrapper", **kwargs: Any + self, complex_body: _models.DoubleWrapper, **kwargs: Any ) -> None: """Put complex types with double properties. @@ -405,7 +405,7 @@ async def put_double( # pylint: disable=inconsistent-return-statements put_double.metadata = {"url": "/complex/primitive/double"} # type: ignore @distributed_trace_async - async def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": + async def get_bool(self, **kwargs: Any) -> _models.BooleanWrapper: """Get complex types with bool properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -416,7 +416,7 @@ async def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.BooleanWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.BooleanWrapper] request = build_get_bool_request( template_url=self.get_bool.metadata["url"], @@ -445,7 +445,7 @@ async def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": @distributed_trace_async async def put_bool( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.BooleanWrapper", **kwargs: Any + self, complex_body: _models.BooleanWrapper, **kwargs: Any ) -> None: """Put complex types with bool properties. @@ -488,7 +488,7 @@ async def put_bool( # pylint: disable=inconsistent-return-statements put_bool.metadata = {"url": "/complex/primitive/bool"} # type: ignore @distributed_trace_async - async def get_string(self, **kwargs: Any) -> "_models.StringWrapper": + async def get_string(self, **kwargs: Any) -> _models.StringWrapper: """Get complex types with string properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -499,7 +499,7 @@ async def get_string(self, **kwargs: Any) -> "_models.StringWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.StringWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StringWrapper] request = build_get_string_request( template_url=self.get_string.metadata["url"], @@ -528,7 +528,7 @@ async def get_string(self, **kwargs: Any) -> "_models.StringWrapper": @distributed_trace_async async def put_string( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.StringWrapper", **kwargs: Any + self, complex_body: _models.StringWrapper, **kwargs: Any ) -> None: """Put complex types with string properties. @@ -571,7 +571,7 @@ async def put_string( # pylint: disable=inconsistent-return-statements put_string.metadata = {"url": "/complex/primitive/string"} # type: ignore @distributed_trace_async - async def get_date(self, **kwargs: Any) -> "_models.DateWrapper": + async def get_date(self, **kwargs: Any) -> _models.DateWrapper: """Get complex types with date properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -582,7 +582,7 @@ async def get_date(self, **kwargs: Any) -> "_models.DateWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DateWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DateWrapper] request = build_get_date_request( template_url=self.get_date.metadata["url"], @@ -611,7 +611,7 @@ async def get_date(self, **kwargs: Any) -> "_models.DateWrapper": @distributed_trace_async async def put_date( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DateWrapper", **kwargs: Any + self, complex_body: _models.DateWrapper, **kwargs: Any ) -> None: """Put complex types with date properties. @@ -654,7 +654,7 @@ async def put_date( # pylint: disable=inconsistent-return-statements put_date.metadata = {"url": "/complex/primitive/date"} # type: ignore @distributed_trace_async - async def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": + async def get_date_time(self, **kwargs: Any) -> _models.DatetimeWrapper: """Get complex types with datetime properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -665,7 +665,7 @@ async def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DatetimeWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DatetimeWrapper] request = build_get_date_time_request( template_url=self.get_date_time.metadata["url"], @@ -694,7 +694,7 @@ async def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": @distributed_trace_async async def put_date_time( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DatetimeWrapper", **kwargs: Any + self, complex_body: _models.DatetimeWrapper, **kwargs: Any ) -> None: """Put complex types with datetime properties. @@ -737,7 +737,7 @@ async def put_date_time( # pylint: disable=inconsistent-return-statements put_date_time.metadata = {"url": "/complex/primitive/datetime"} # type: ignore @distributed_trace_async - async def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123Wrapper": + async def get_date_time_rfc1123(self, **kwargs: Any) -> _models.Datetimerfc1123Wrapper: """Get complex types with datetimeRfc1123 properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -748,7 +748,7 @@ async def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123 error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Datetimerfc1123Wrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Datetimerfc1123Wrapper] request = build_get_date_time_rfc1123_request( template_url=self.get_date_time_rfc1123.metadata["url"], @@ -777,7 +777,7 @@ async def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123 @distributed_trace_async async def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Datetimerfc1123Wrapper", **kwargs: Any + self, complex_body: _models.Datetimerfc1123Wrapper, **kwargs: Any ) -> None: """Put complex types with datetimeRfc1123 properties. @@ -821,7 +821,7 @@ async def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statemen put_date_time_rfc1123.metadata = {"url": "/complex/primitive/datetimerfc1123"} # type: ignore @distributed_trace_async - async def get_duration(self, **kwargs: Any) -> "_models.DurationWrapper": + async def get_duration(self, **kwargs: Any) -> _models.DurationWrapper: """Get complex types with duration properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -832,7 +832,7 @@ async def get_duration(self, **kwargs: Any) -> "_models.DurationWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DurationWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DurationWrapper] request = build_get_duration_request( template_url=self.get_duration.metadata["url"], @@ -905,7 +905,7 @@ async def put_duration( # pylint: disable=inconsistent-return-statements put_duration.metadata = {"url": "/complex/primitive/duration"} # type: ignore @distributed_trace_async - async def get_byte(self, **kwargs: Any) -> "_models.ByteWrapper": + async def get_byte(self, **kwargs: Any) -> _models.ByteWrapper: """Get complex types with byte properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -916,7 +916,7 @@ async def get_byte(self, **kwargs: Any) -> "_models.ByteWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ByteWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ByteWrapper] request = build_get_byte_request( template_url=self.get_byte.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_readonlyproperty_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_readonlyproperty_operations.py index 739fe19c865..1cca768da21 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_readonlyproperty_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/aio/operations/_readonlyproperty_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_valid(self, **kwargs: Any) -> "_models.ReadonlyObj": + async def get_valid(self, **kwargs: Any) -> _models.ReadonlyObj: """Get complex types that have readonly properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -59,7 +59,7 @@ async def get_valid(self, **kwargs: Any) -> "_models.ReadonlyObj": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ReadonlyObj"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ReadonlyObj] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_auto_rest_complex_test_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_auto_rest_complex_test_service_enums.py index dd6d79768e0..893c9c9f88f 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_auto_rest_complex_test_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_auto_rest_complex_test_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class CMYKColors(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class CMYKColors(str, Enum, metaclass=CaseInsensitiveEnumMeta): CYAN = "cyan" MAGENTA = "Magenta" @@ -19,7 +18,7 @@ class CMYKColors(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): BLAC_K = "blacK" -class GoblinSharkColor(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class GoblinSharkColor(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Colors possible""" PINK = "pink" @@ -31,6 +30,6 @@ class GoblinSharkColor(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): LOWER_RED = "red" -class MyKind(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class MyKind(str, Enum, metaclass=CaseInsensitiveEnumMeta): KIND1 = "Kind1" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_models_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_models_py3.py index b2b8af65b67..10e9e68c662 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_models_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/models/_models_py3.py @@ -12,8 +12,6 @@ from azure.core.exceptions import HttpResponseError import msrest.serialization -from ._auto_rest_complex_test_service_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_array_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_array_operations.py index 27045d1d760..9a2b7d261c5 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_array_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_array_operations.py @@ -121,7 +121,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.ArrayWrapper": + def get_valid(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -132,7 +132,7 @@ def get_valid(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -205,7 +205,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/array/valid"} # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> "_models.ArrayWrapper": + def get_empty(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -216,7 +216,7 @@ def get_empty(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -289,7 +289,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements put_empty.metadata = {"url": "/complex/array/empty"} # type: ignore @distributed_trace - def get_not_provided(self, **kwargs: Any) -> "_models.ArrayWrapper": + def get_not_provided(self, **kwargs: Any) -> _models.ArrayWrapper: """Get complex types with array property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -300,7 +300,7 @@ def get_not_provided(self, **kwargs: Any) -> "_models.ArrayWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ArrayWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ArrayWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_basic_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_basic_operations.py index 7ad2d5971e3..2dd68456e60 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_basic_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_basic_operations.py @@ -142,7 +142,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.Basic": + def get_valid(self, **kwargs: Any) -> _models.Basic: """Get complex type {id: 2, name: 'abc', color: 'YELLOW'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -153,7 +153,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -182,7 +182,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Basic": @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Basic", **kwargs: Any + self, complex_body: _models.Basic, **kwargs: Any ) -> None: """Please put {id: 2, name: 'abc', color: 'Magenta'}. @@ -227,7 +227,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/basic/valid"} # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> "_models.Basic": + def get_invalid(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type that is invalid for the local strong type. :keyword callable cls: A custom type or function that will be passed the direct response @@ -238,7 +238,7 @@ def get_invalid(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_invalid_request( template_url=self.get_invalid.metadata["url"], @@ -266,7 +266,7 @@ def get_invalid(self, **kwargs: Any) -> "_models.Basic": get_invalid.metadata = {"url": "/complex/basic/invalid"} # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> "_models.Basic": + def get_empty(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type that is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -277,7 +277,7 @@ def get_empty(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -305,7 +305,7 @@ def get_empty(self, **kwargs: Any) -> "_models.Basic": get_empty.metadata = {"url": "/complex/basic/empty"} # type: ignore @distributed_trace - def get_null(self, **kwargs: Any) -> "_models.Basic": + def get_null(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type whose properties are null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -316,7 +316,7 @@ def get_null(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -344,7 +344,7 @@ def get_null(self, **kwargs: Any) -> "_models.Basic": get_null.metadata = {"url": "/complex/basic/null"} # type: ignore @distributed_trace - def get_not_provided(self, **kwargs: Any) -> "_models.Basic": + def get_not_provided(self, **kwargs: Any) -> _models.Basic: """Get a basic complex type while the server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -355,7 +355,7 @@ def get_not_provided(self, **kwargs: Any) -> "_models.Basic": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Basic"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Basic] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_dictionary_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_dictionary_operations.py index a6e1a3e987f..73c5794a0a8 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_dictionary_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_dictionary_operations.py @@ -133,7 +133,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.DictionaryWrapper": + def get_valid(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -144,7 +144,7 @@ def get_valid(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -217,7 +217,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/dictionary/typed/valid"} # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> "_models.DictionaryWrapper": + def get_empty(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property which is empty. :keyword callable cls: A custom type or function that will be passed the direct response @@ -228,7 +228,7 @@ def get_empty(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_empty_request( template_url=self.get_empty.metadata["url"], @@ -301,7 +301,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements put_empty.metadata = {"url": "/complex/dictionary/typed/empty"} # type: ignore @distributed_trace - def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": + def get_null(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property which is null. :keyword callable cls: A custom type or function that will be passed the direct response @@ -312,7 +312,7 @@ def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_null_request( template_url=self.get_null.metadata["url"], @@ -340,7 +340,7 @@ def get_null(self, **kwargs: Any) -> "_models.DictionaryWrapper": get_null.metadata = {"url": "/complex/dictionary/typed/null"} # type: ignore @distributed_trace - def get_not_provided(self, **kwargs: Any) -> "_models.DictionaryWrapper": + def get_not_provided(self, **kwargs: Any) -> _models.DictionaryWrapper: """Get complex types with dictionary property while server doesn't provide a response payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -351,7 +351,7 @@ def get_not_provided(self, **kwargs: Any) -> "_models.DictionaryWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DictionaryWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DictionaryWrapper] request = build_get_not_provided_request( template_url=self.get_not_provided.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_flattencomplex_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_flattencomplex_operations.py index bd2020cf111..e86f5a83eca 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_flattencomplex_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_flattencomplex_operations.py @@ -64,7 +64,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.MyBaseType": + def get_valid(self, **kwargs: Any) -> _models.MyBaseType: """get_valid. :keyword callable cls: A custom type or function that will be passed the direct response @@ -75,7 +75,7 @@ def get_valid(self, **kwargs: Any) -> "_models.MyBaseType": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyBaseType"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyBaseType] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_inheritance_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_inheritance_operations.py index beb2e9801d9..16b855fd188 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_inheritance_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_inheritance_operations.py @@ -81,7 +81,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.Siamese": + def get_valid(self, **kwargs: Any) -> _models.Siamese: """Get complex types that extend others. :keyword callable cls: A custom type or function that will be passed the direct response @@ -92,7 +92,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Siamese": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Siamese"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Siamese] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -121,7 +121,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Siamese": @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Siamese", **kwargs: Any + self, complex_body: _models.Siamese, **kwargs: Any ) -> None: """Put complex types that extend others. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphicrecursive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphicrecursive_operations.py index 11dce1fd5fe..54eea005098 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphicrecursive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphicrecursive_operations.py @@ -81,7 +81,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.Fish": + def get_valid(self, **kwargs: Any) -> _models.Fish: """Get complex types that are polymorphic and have recursive references. :keyword callable cls: A custom type or function that will be passed the direct response @@ -92,7 +92,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Fish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -121,7 +121,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Fish": @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic and have recursive references. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphism_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphism_operations.py index 85f20917915..344b09fb58c 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphism_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_polymorphism_operations.py @@ -181,7 +181,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.Fish": + def get_valid(self, **kwargs: Any) -> _models.Fish: """Get complex types that are polymorphic. :keyword callable cls: A custom type or function that will be passed the direct response @@ -192,7 +192,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Fish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Fish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Fish] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], @@ -221,7 +221,7 @@ def get_valid(self, **kwargs: Any) -> "_models.Fish": @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic. @@ -296,7 +296,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements put_valid.metadata = {"url": "/complex/polymorphism/valid"} # type: ignore @distributed_trace - def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": + def get_dot_syntax(self, **kwargs: Any) -> _models.DotFish: """Get complex types that are polymorphic, JSON key contains a dot. :keyword callable cls: A custom type or function that will be passed the direct response @@ -307,7 +307,7 @@ def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFish"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFish] request = build_get_dot_syntax_request( template_url=self.get_dot_syntax.metadata["url"], @@ -335,7 +335,7 @@ def get_dot_syntax(self, **kwargs: Any) -> "_models.DotFish": get_dot_syntax.metadata = {"url": "/complex/polymorphism/dotsyntax"} # type: ignore @distributed_trace - def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFishMarket": + def get_composed_with_discriminator(self, **kwargs: Any) -> _models.DotFishMarket: """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, with discriminator specified. Deserialization must NOT fail and use the discriminator type specified on the wire. @@ -348,7 +348,7 @@ def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFishMark error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_with_discriminator_request( template_url=self.get_composed_with_discriminator.metadata["url"], @@ -376,7 +376,7 @@ def get_composed_with_discriminator(self, **kwargs: Any) -> "_models.DotFishMark get_composed_with_discriminator.metadata = {"url": "/complex/polymorphism/composedWithDiscriminator"} # type: ignore @distributed_trace - def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.DotFishMarket": + def get_composed_without_discriminator(self, **kwargs: Any) -> _models.DotFishMarket: """Get complex object composing a polymorphic scalar property and array property with polymorphic element type, without discriminator specified on wire. Deserialization must NOT fail and use the explicit type of the property. @@ -389,7 +389,7 @@ def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.DotFishM error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DotFishMarket"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DotFishMarket] request = build_get_composed_without_discriminator_request( template_url=self.get_composed_without_discriminator.metadata["url"], @@ -417,7 +417,7 @@ def get_composed_without_discriminator(self, **kwargs: Any) -> "_models.DotFishM get_composed_without_discriminator.metadata = {"url": "/complex/polymorphism/composedWithoutDiscriminator"} # type: ignore @distributed_trace - def get_complicated(self, **kwargs: Any) -> "_models.Salmon": + def get_complicated(self, **kwargs: Any) -> _models.Salmon: """Get complex types that are polymorphic, but not at the root of the hierarchy; also have additional properties. @@ -429,7 +429,7 @@ def get_complicated(self, **kwargs: Any) -> "_models.Salmon": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] request = build_get_complicated_request( template_url=self.get_complicated.metadata["url"], @@ -458,7 +458,7 @@ def get_complicated(self, **kwargs: Any) -> "_models.Salmon": @distributed_trace def put_complicated( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Salmon", **kwargs: Any + self, complex_body: _models.Salmon, **kwargs: Any ) -> None: """Put complex types that are polymorphic, but not at the root of the hierarchy; also have additional properties. @@ -502,7 +502,7 @@ def put_complicated( # pylint: disable=inconsistent-return-statements put_complicated.metadata = {"url": "/complex/polymorphism/complicated"} # type: ignore @distributed_trace - def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwargs: Any) -> "_models.Salmon": + def put_missing_discriminator(self, complex_body: _models.Salmon, **kwargs: Any) -> _models.Salmon: """Put complex types that are polymorphic, omitting the discriminator. :param complex_body: @@ -516,7 +516,7 @@ def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwargs: An error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Salmon"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Salmon] _json = self._serialize.body(complex_body, "Salmon") @@ -549,7 +549,7 @@ def put_missing_discriminator(self, complex_body: "_models.Salmon", **kwargs: An @distributed_trace def put_valid_missing_required( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Fish", **kwargs: Any + self, complex_body: _models.Fish, **kwargs: Any ) -> None: """Put complex types that are polymorphic, attempting to omit required 'birthday' field - the request should not be allowed from the client. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_primitive_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_primitive_operations.py index 9c8f80eec3e..0825f0ebe83 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_primitive_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_primitive_operations.py @@ -362,7 +362,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_int(self, **kwargs: Any) -> "_models.IntWrapper": + def get_int(self, **kwargs: Any) -> _models.IntWrapper: """Get complex types with integer properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -373,7 +373,7 @@ def get_int(self, **kwargs: Any) -> "_models.IntWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.IntWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.IntWrapper] request = build_get_int_request( template_url=self.get_int.metadata["url"], @@ -402,7 +402,7 @@ def get_int(self, **kwargs: Any) -> "_models.IntWrapper": @distributed_trace def put_int( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.IntWrapper", **kwargs: Any + self, complex_body: _models.IntWrapper, **kwargs: Any ) -> None: """Put complex types with integer properties. @@ -445,7 +445,7 @@ def put_int( # pylint: disable=inconsistent-return-statements put_int.metadata = {"url": "/complex/primitive/integer"} # type: ignore @distributed_trace - def get_long(self, **kwargs: Any) -> "_models.LongWrapper": + def get_long(self, **kwargs: Any) -> _models.LongWrapper: """Get complex types with long properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -456,7 +456,7 @@ def get_long(self, **kwargs: Any) -> "_models.LongWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.LongWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.LongWrapper] request = build_get_long_request( template_url=self.get_long.metadata["url"], @@ -485,7 +485,7 @@ def get_long(self, **kwargs: Any) -> "_models.LongWrapper": @distributed_trace def put_long( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.LongWrapper", **kwargs: Any + self, complex_body: _models.LongWrapper, **kwargs: Any ) -> None: """Put complex types with long properties. @@ -528,7 +528,7 @@ def put_long( # pylint: disable=inconsistent-return-statements put_long.metadata = {"url": "/complex/primitive/long"} # type: ignore @distributed_trace - def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": + def get_float(self, **kwargs: Any) -> _models.FloatWrapper: """Get complex types with float properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -539,7 +539,7 @@ def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.FloatWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.FloatWrapper] request = build_get_float_request( template_url=self.get_float.metadata["url"], @@ -568,7 +568,7 @@ def get_float(self, **kwargs: Any) -> "_models.FloatWrapper": @distributed_trace def put_float( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.FloatWrapper", **kwargs: Any + self, complex_body: _models.FloatWrapper, **kwargs: Any ) -> None: """Put complex types with float properties. @@ -611,7 +611,7 @@ def put_float( # pylint: disable=inconsistent-return-statements put_float.metadata = {"url": "/complex/primitive/float"} # type: ignore @distributed_trace - def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": + def get_double(self, **kwargs: Any) -> _models.DoubleWrapper: """Get complex types with double properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -622,7 +622,7 @@ def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DoubleWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DoubleWrapper] request = build_get_double_request( template_url=self.get_double.metadata["url"], @@ -651,7 +651,7 @@ def get_double(self, **kwargs: Any) -> "_models.DoubleWrapper": @distributed_trace def put_double( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DoubleWrapper", **kwargs: Any + self, complex_body: _models.DoubleWrapper, **kwargs: Any ) -> None: """Put complex types with double properties. @@ -695,7 +695,7 @@ def put_double( # pylint: disable=inconsistent-return-statements put_double.metadata = {"url": "/complex/primitive/double"} # type: ignore @distributed_trace - def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": + def get_bool(self, **kwargs: Any) -> _models.BooleanWrapper: """Get complex types with bool properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -706,7 +706,7 @@ def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.BooleanWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.BooleanWrapper] request = build_get_bool_request( template_url=self.get_bool.metadata["url"], @@ -735,7 +735,7 @@ def get_bool(self, **kwargs: Any) -> "_models.BooleanWrapper": @distributed_trace def put_bool( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.BooleanWrapper", **kwargs: Any + self, complex_body: _models.BooleanWrapper, **kwargs: Any ) -> None: """Put complex types with bool properties. @@ -778,7 +778,7 @@ def put_bool( # pylint: disable=inconsistent-return-statements put_bool.metadata = {"url": "/complex/primitive/bool"} # type: ignore @distributed_trace - def get_string(self, **kwargs: Any) -> "_models.StringWrapper": + def get_string(self, **kwargs: Any) -> _models.StringWrapper: """Get complex types with string properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -789,7 +789,7 @@ def get_string(self, **kwargs: Any) -> "_models.StringWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.StringWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StringWrapper] request = build_get_string_request( template_url=self.get_string.metadata["url"], @@ -818,7 +818,7 @@ def get_string(self, **kwargs: Any) -> "_models.StringWrapper": @distributed_trace def put_string( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.StringWrapper", **kwargs: Any + self, complex_body: _models.StringWrapper, **kwargs: Any ) -> None: """Put complex types with string properties. @@ -861,7 +861,7 @@ def put_string( # pylint: disable=inconsistent-return-statements put_string.metadata = {"url": "/complex/primitive/string"} # type: ignore @distributed_trace - def get_date(self, **kwargs: Any) -> "_models.DateWrapper": + def get_date(self, **kwargs: Any) -> _models.DateWrapper: """Get complex types with date properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -872,7 +872,7 @@ def get_date(self, **kwargs: Any) -> "_models.DateWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DateWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DateWrapper] request = build_get_date_request( template_url=self.get_date.metadata["url"], @@ -901,7 +901,7 @@ def get_date(self, **kwargs: Any) -> "_models.DateWrapper": @distributed_trace def put_date( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DateWrapper", **kwargs: Any + self, complex_body: _models.DateWrapper, **kwargs: Any ) -> None: """Put complex types with date properties. @@ -944,7 +944,7 @@ def put_date( # pylint: disable=inconsistent-return-statements put_date.metadata = {"url": "/complex/primitive/date"} # type: ignore @distributed_trace - def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": + def get_date_time(self, **kwargs: Any) -> _models.DatetimeWrapper: """Get complex types with datetime properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -955,7 +955,7 @@ def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DatetimeWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DatetimeWrapper] request = build_get_date_time_request( template_url=self.get_date_time.metadata["url"], @@ -984,7 +984,7 @@ def get_date_time(self, **kwargs: Any) -> "_models.DatetimeWrapper": @distributed_trace def put_date_time( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.DatetimeWrapper", **kwargs: Any + self, complex_body: _models.DatetimeWrapper, **kwargs: Any ) -> None: """Put complex types with datetime properties. @@ -1027,7 +1027,7 @@ def put_date_time( # pylint: disable=inconsistent-return-statements put_date_time.metadata = {"url": "/complex/primitive/datetime"} # type: ignore @distributed_trace - def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123Wrapper": + def get_date_time_rfc1123(self, **kwargs: Any) -> _models.Datetimerfc1123Wrapper: """Get complex types with datetimeRfc1123 properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1038,7 +1038,7 @@ def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123Wrappe error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Datetimerfc1123Wrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Datetimerfc1123Wrapper] request = build_get_date_time_rfc1123_request( template_url=self.get_date_time_rfc1123.metadata["url"], @@ -1067,7 +1067,7 @@ def get_date_time_rfc1123(self, **kwargs: Any) -> "_models.Datetimerfc1123Wrappe @distributed_trace def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements - self, complex_body: "_models.Datetimerfc1123Wrapper", **kwargs: Any + self, complex_body: _models.Datetimerfc1123Wrapper, **kwargs: Any ) -> None: """Put complex types with datetimeRfc1123 properties. @@ -1111,7 +1111,7 @@ def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements put_date_time_rfc1123.metadata = {"url": "/complex/primitive/datetimerfc1123"} # type: ignore @distributed_trace - def get_duration(self, **kwargs: Any) -> "_models.DurationWrapper": + def get_duration(self, **kwargs: Any) -> _models.DurationWrapper: """Get complex types with duration properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1122,7 +1122,7 @@ def get_duration(self, **kwargs: Any) -> "_models.DurationWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.DurationWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DurationWrapper] request = build_get_duration_request( template_url=self.get_duration.metadata["url"], @@ -1195,7 +1195,7 @@ def put_duration( # pylint: disable=inconsistent-return-statements put_duration.metadata = {"url": "/complex/primitive/duration"} # type: ignore @distributed_trace - def get_byte(self, **kwargs: Any) -> "_models.ByteWrapper": + def get_byte(self, **kwargs: Any) -> _models.ByteWrapper: """Get complex types with byte properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1206,7 +1206,7 @@ def get_byte(self, **kwargs: Any) -> "_models.ByteWrapper": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ByteWrapper"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ByteWrapper] request = build_get_byte_request( template_url=self.get_byte.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_readonlyproperty_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_readonlyproperty_operations.py index 191f28f6059..fb8f652ebc9 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_readonlyproperty_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplexPythonThreeOnly/bodycomplexpython3only/operations/_readonlyproperty_operations.py @@ -81,7 +81,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_valid(self, **kwargs: Any) -> "_models.ReadonlyObj": + def get_valid(self, **kwargs: Any) -> _models.ReadonlyObj: """Get complex types that have readonly properties. :keyword callable cls: A custom type or function that will be passed the direct response @@ -92,7 +92,7 @@ def get_valid(self, **kwargs: Any) -> "_models.ReadonlyObj": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ReadonlyObj"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ReadonlyObj] request = build_get_valid_request( template_url=self.get_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py index 92439728445..d6a4e6622ed 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py @@ -2016,7 +2016,7 @@ async def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: get_base64_url.metadata = {"url": "/dictionary/prim/base64url/valid"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2027,7 +2027,7 @@ async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, "_models.W error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional[Dict[str, "_models.Widget"]]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[Dict[str, _models.Widget]]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -2055,7 +2055,7 @@ async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, "_models.W get_complex_null.metadata = {"url": "/dictionary/complex/null"} # 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 {}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2066,7 +2066,7 @@ async def get_complex_empty(self, **kwargs: Any) -> Dict[str, "_models.Widget"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -2094,7 +2094,7 @@ async def get_complex_empty(self, **kwargs: Any) -> Dict[str, "_models.Widget"]: get_complex_empty.metadata = {"url": "/dictionary/complex/empty"} # 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"}}. @@ -2106,7 +2106,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, "_models.Widge error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -2134,7 +2134,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, "_models.Widge get_complex_item_null.metadata = {"url": "/dictionary/complex/itemnull"} # 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"}}. @@ -2146,7 +2146,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, "_models.Widg error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -2174,7 +2174,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, "_models.Widg get_complex_item_empty.metadata = {"url": "/dictionary/complex/itemempty"} # 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"}}. @@ -2186,7 +2186,7 @@ async def get_complex_valid(self, **kwargs: Any) -> Dict[str, "_models.Widget"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -2215,7 +2215,7 @@ async def get_complex_valid(self, **kwargs: Any) -> Dict[str, "_models.Widget"]: @distributed_trace_async async def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Dict[str, "_models.Widget"], **kwargs: Any + self, array_body: Dict[str, _models.Widget], **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"}}. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py index 5ceb31a25c0..f6058096aa6 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py @@ -3462,7 +3462,7 @@ def get_base64_url( def get_complex_null( self, **kwargs # type: Any ): - # type: (...) -> Optional[Dict[str, "_models.Widget"]] + # type: (...) -> Optional[Dict[str, _models.Widget]] """Get dictionary of complex type null value. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3473,7 +3473,7 @@ def get_complex_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional[Dict[str, "_models.Widget"]]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[Dict[str, _models.Widget]]] request = build_get_complex_null_request( template_url=self.get_complex_null.metadata["url"], @@ -3504,7 +3504,7 @@ def get_complex_null( def get_complex_empty( self, **kwargs # type: Any ): - # type: (...) -> Dict[str, "_models.Widget"] + # type: (...) -> Dict[str, _models.Widget] """Get empty dictionary of complex type {}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -3515,7 +3515,7 @@ def get_complex_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_empty_request( template_url=self.get_complex_empty.metadata["url"], @@ -3546,7 +3546,7 @@ def get_complex_empty( def get_complex_item_null( self, **kwargs # type: Any ): - # type: (...) -> Dict[str, "_models.Widget"] + # type: (...) -> Dict[str, _models.Widget] """Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}. @@ -3558,7 +3558,7 @@ def get_complex_item_null( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_item_null_request( template_url=self.get_complex_item_null.metadata["url"], @@ -3589,7 +3589,7 @@ def get_complex_item_null( def get_complex_item_empty( self, **kwargs # type: Any ): - # type: (...) -> Dict[str, "_models.Widget"] + # type: (...) -> Dict[str, _models.Widget] """Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}. @@ -3601,7 +3601,7 @@ def get_complex_item_empty( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_item_empty_request( template_url=self.get_complex_item_empty.metadata["url"], @@ -3632,7 +3632,7 @@ def get_complex_item_empty( def get_complex_valid( self, **kwargs # type: Any ): - # type: (...) -> Dict[str, "_models.Widget"] + # type: (...) -> 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"}}. @@ -3644,7 +3644,7 @@ def get_complex_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.Widget"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.Widget]] request = build_get_complex_valid_request( template_url=self.get_complex_valid.metadata["url"], @@ -3674,7 +3674,7 @@ def get_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements self, - array_body, # type: Dict[str, "_models.Widget"] + array_body, # type: Dict[str, _models.Widget] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_body_forms_data_url_encoded_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_body_forms_data_url_encoded_enums.py index 86d0f7d40d7..04ce9e3365b 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_body_forms_data_url_encoded_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_body_forms_data_url_encoded_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class PetFood(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class PetFood(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Can take a value of meat, or fish, or plant""" MEAT = "meat" @@ -19,7 +18,7 @@ class PetFood(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): PLANT = "plant" -class PetType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class PetType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Can take a value of dog, or cat, or fish""" DOG = "dog" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_models_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_models_py3.py index 666f4025675..aac41f8373a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_models_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/models/_models_py3.py @@ -10,8 +10,6 @@ import msrest.serialization -from ._body_forms_data_url_encoded_enums import * - class Paths14Hl8BdFormsdataurlencodedPetAddPetidPostRequestbodyContentApplicationXWwwFormUrlencodedSchema( msrest.serialization.Model diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py index ab907d05730..95f96c91026 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py @@ -221,7 +221,7 @@ async def put_referenced( # pylint: disable=inconsistent-return-statements put_referenced.metadata = {"url": "/string/enum/Referenced"} # type: ignore @distributed_trace_async - async def get_referenced_constant(self, **kwargs: Any) -> "_models.RefColorConstant": + async def get_referenced_constant(self, **kwargs: Any) -> _models.RefColorConstant: """Get value 'green-color' from the constant. :keyword callable cls: A custom type or function that will be passed the direct response @@ -232,7 +232,7 @@ async def get_referenced_constant(self, **kwargs: Any) -> "_models.RefColorConst error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.RefColorConstant"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.RefColorConstant] request = build_get_referenced_constant_request( template_url=self.get_referenced_constant.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/models/_auto_rest_swagger_bat_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/models/_auto_rest_swagger_bat_service_enums.py index c749a18ba65..c04b3770e54 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/models/_auto_rest_swagger_bat_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/models/_auto_rest_swagger_bat_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class Colors(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class Colors(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Referenced Color Enum Description.""" RED_COLOR = "red color" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py index dd5f18be320..00697f7346b 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py @@ -369,7 +369,7 @@ def put_referenced( # pylint: disable=inconsistent-return-statements def get_referenced_constant( self, **kwargs # type: Any ): - # type: (...) -> "_models.RefColorConstant" + # type: (...) -> _models.RefColorConstant """Get value 'green-color' from the constant. :keyword callable cls: A custom type or function that will be passed the direct response @@ -380,7 +380,7 @@ def get_referenced_constant( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.RefColorConstant"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.RefColorConstant] request = build_get_referenced_constant_request( template_url=self.get_referenced_constant.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_auto_rest_swagger_constant_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_auto_rest_swagger_constant_service_enums.py index 51d90dc2630..30f74d62284 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_auto_rest_swagger_constant_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_auto_rest_swagger_constant_service_enums.py @@ -7,141 +7,140 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ModelAsStringNoRequiredOneValueDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredOneValueDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringNoRequiredOneValueDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredOneValueDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringNoRequiredOneValueNoDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredOneValueNoDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringNoRequiredOneValueNoDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredOneValueNoDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringNoRequiredTwoValueDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredTwoValueDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class ModelAsStringNoRequiredTwoValueDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredTwoValueDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class ModelAsStringNoRequiredTwoValueNoDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredTwoValueNoDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class ModelAsStringNoRequiredTwoValueNoDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringNoRequiredTwoValueNoDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class ModelAsStringRequiredOneValueDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredOneValueDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringRequiredOneValueDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredOneValueDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringRequiredOneValueNoDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredOneValueNoDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringRequiredOneValueNoDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredOneValueNoDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" -class ModelAsStringRequiredTwoValueDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredTwoValueDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class ModelAsStringRequiredTwoValueDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredTwoValueDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class ModelAsStringRequiredTwoValueNoDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredTwoValueNoDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class ModelAsStringRequiredTwoValueNoDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ModelAsStringRequiredTwoValueNoDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringNoRequiredTwoValueDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringNoRequiredTwoValueDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringNoRequiredTwoValueDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringNoRequiredTwoValueDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringNoRequiredTwoValueNoDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringNoRequiredTwoValueNoDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringNoRequiredTwoValueNoDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringNoRequiredTwoValueNoDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringRequiredTwoValueDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringRequiredTwoValueDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringRequiredTwoValueDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringRequiredTwoValueDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringRequiredTwoValueNoDefaultEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringRequiredTwoValueNoDefaultEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" -class NoModelAsStringRequiredTwoValueNoDefaultOpEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class NoModelAsStringRequiredTwoValueNoDefaultOpEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALUE1 = "value1" VALUE2 = "value2" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_models_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_models_py3.py index 0de769ea4f6..0f6636fcfd4 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_models_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/models/_models_py3.py @@ -10,8 +10,6 @@ import msrest.serialization -from ._auto_rest_swagger_constant_service_enums import * - class ModelAsStringNoRequiredOneValueDefault(msrest.serialization.Model): """ModelAsStringNoRequiredOneValueDefault. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_errorwith_secrets_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_errorwith_secrets_operations.py index b33be3b48e9..c975331fe3c 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_errorwith_secrets_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_errorwith_secrets_operations.py @@ -33,7 +33,7 @@ class ErrorWithSecretsOperationsMixin: @distributed_trace_async - async def create_secret(self, **kwargs: Any) -> "_models.SecretResponse": + async def create_secret(self, **kwargs: Any) -> _models.SecretResponse: """Creates a secret. :keyword callable cls: A custom type or function that will be passed the direct response @@ -44,7 +44,7 @@ async def create_secret(self, **kwargs: Any) -> "_models.SecretResponse": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.SecretResponse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SecretResponse] request = build_create_secret_request( template_url=self.create_secret.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_errorwith_secrets_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_errorwith_secrets_enums.py index f8ea2258b0f..422ec09b849 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_errorwith_secrets_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_errorwith_secrets_enums.py @@ -7,18 +7,17 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ErrorCode(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ErrorCode(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Human-readable error code.""" BAD_PARAMETER = "BadParameter" UNAUTHORIZED = "Unauthorized" -class InnerErrorCode(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class InnerErrorCode(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Human-readable error code.""" MISSING_SHARED_KEY = "MissingSharedKey" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py index 148b0bfbb57..d5dcfda995a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py @@ -11,8 +11,6 @@ from azure.core.exceptions import HttpResponseError import msrest.serialization -from ._errorwith_secrets_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_errorwith_secrets_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_errorwith_secrets_operations.py index 9aa4bc47504..b0ed7e785fe 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_errorwith_secrets_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_errorwith_secrets_operations.py @@ -81,7 +81,7 @@ class ErrorWithSecretsOperationsMixin(object): def create_secret( self, **kwargs # type: Any ): - # type: (...) -> "_models.SecretResponse" + # type: (...) -> _models.SecretResponse """Creates a secret. :keyword callable cls: A custom type or function that will be passed the direct response @@ -92,7 +92,7 @@ def create_secret( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.SecretResponse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SecretResponse] request = build_create_secret_request( template_url=self.create_secret.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py index e86c9c1eb46..6e471aa6e6c 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py @@ -48,7 +48,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> "_models.Pet": + async def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> _models.Pet: """get pet by id. :param pet_id: Pet id. @@ -61,7 +61,7 @@ async def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> "_models.Pet": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Pet"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Pet] request = build_get_by_pet_id_request( pet_id=pet_id, @@ -89,7 +89,7 @@ async def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> "_models.Pet": get_by_pet_id.metadata = {"url": "/extensibleenums/pet/{petId}"} # type: ignore @distributed_trace_async - async def add_pet(self, pet_param: Optional["_models.Pet"] = None, **kwargs: Any) -> "_models.Pet": + async def add_pet(self, pet_param: Optional[_models.Pet] = None, **kwargs: Any) -> _models.Pet: """add pet. :param pet_param: pet param. Default value is None. @@ -103,7 +103,7 @@ async def add_pet(self, pet_param: Optional["_models.Pet"] = None, **kwargs: Any error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Pet"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Pet] if pet_param is not None: _json = self._serialize.body(pet_param, "Pet") diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_models_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_models_py3.py index d71d0b2ffc1..60ae554734a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_models_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_models_py3.py @@ -10,8 +10,6 @@ import msrest.serialization -from ._pet_store_inc_enums import * - class Pet(msrest.serialization.Model): """Pet. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py index 5a1b6c24d09..4578b2eb0c1 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/models/_pet_store_inc_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class DaysOfWeekExtensibleEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class DaysOfWeekExtensibleEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Type of Pet""" MONDAY = "Monday" @@ -23,7 +22,7 @@ class DaysOfWeekExtensibleEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum SUNDAY = "Sunday" -class IntEnum(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class IntEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): #: This is a really long comment to see what wrapping looks like. This comment is really long and #: it should wrap for readability. Please wrap. This should wrap. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py index bcb5875d3b9..21cc20b29a4 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py @@ -111,7 +111,7 @@ def get_by_pet_id( pet_id, # type: str **kwargs # type: Any ): - # type: (...) -> "_models.Pet" + # type: (...) -> _models.Pet """get pet by id. :param pet_id: Pet id. @@ -124,7 +124,7 @@ def get_by_pet_id( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Pet"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Pet] request = build_get_by_pet_id_request( pet_id=pet_id, @@ -154,10 +154,10 @@ def get_by_pet_id( @distributed_trace def add_pet( self, - pet_param=None, # type: Optional["_models.Pet"] + pet_param=None, # type: Optional[_models.Pet] **kwargs # type: Any ): - # type: (...) -> "_models.Pet" + # type: (...) -> _models.Pet """add pet. :param pet_param: pet param. Default value is None. @@ -171,7 +171,7 @@ def add_pet( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Pet"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Pet] if pet_param is not None: _json = self._serialize.body(pet_param, "Pet") diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/models/_auto_rest_swagger_bat_header_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/models/_auto_rest_swagger_bat_header_service_enums.py index d56efdae0ef..0ff4b02d553 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/models/_auto_rest_swagger_bat_header_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/models/_auto_rest_swagger_bat_header_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class GreyscaleColors(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class GreyscaleColors(str, Enum, metaclass=CaseInsensitiveEnumMeta): WHITE = "White" BLACK = "black" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py index 9907d609ccc..85d3008543c 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py @@ -83,7 +83,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get200_model204_no_model_default_error200_valid(self, **kwargs: Any) -> Optional["_models.MyException"]: + async def get200_model204_no_model_default_error200_valid(self, **kwargs: Any) -> Optional[_models.MyException]: """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -94,7 +94,7 @@ async def get200_model204_no_model_default_error200_valid(self, **kwargs: Any) - error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error200_valid_request( template_url=self.get200_model204_no_model_default_error200_valid.metadata["url"], @@ -124,7 +124,7 @@ async def get200_model204_no_model_default_error200_valid(self, **kwargs: Any) - get200_model204_no_model_default_error200_valid.metadata = {"url": "/http/payloads/200/A/204/none/default/Error/response/200/valid"} # type: ignore @distributed_trace_async - async def get200_model204_no_model_default_error204_valid(self, **kwargs: Any) -> Optional["_models.MyException"]: + async def get200_model204_no_model_default_error204_valid(self, **kwargs: Any) -> Optional[_models.MyException]: """Send a 204 response with no payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -135,7 +135,7 @@ async def get200_model204_no_model_default_error204_valid(self, **kwargs: Any) - error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error204_valid_request( template_url=self.get200_model204_no_model_default_error204_valid.metadata["url"], @@ -165,7 +165,7 @@ async def get200_model204_no_model_default_error204_valid(self, **kwargs: Any) - get200_model204_no_model_default_error204_valid.metadata = {"url": "/http/payloads/200/A/204/none/default/Error/response/204/none"} # type: ignore @distributed_trace_async - async def get200_model204_no_model_default_error201_invalid(self, **kwargs: Any) -> Optional["_models.MyException"]: + async def get200_model204_no_model_default_error201_invalid(self, **kwargs: Any) -> Optional[_models.MyException]: """Send a 201 response with valid payload: {'statusCode': '201'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -176,7 +176,7 @@ async def get200_model204_no_model_default_error201_invalid(self, **kwargs: Any) error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error201_invalid_request( template_url=self.get200_model204_no_model_default_error201_invalid.metadata["url"], @@ -206,7 +206,7 @@ async def get200_model204_no_model_default_error201_invalid(self, **kwargs: Any) get200_model204_no_model_default_error201_invalid.metadata = {"url": "/http/payloads/200/A/204/none/default/Error/response/201/valid"} # type: ignore @distributed_trace_async - async def get200_model204_no_model_default_error202_none(self, **kwargs: Any) -> Optional["_models.MyException"]: + async def get200_model204_no_model_default_error202_none(self, **kwargs: Any) -> Optional[_models.MyException]: """Send a 202 response with no payload:. :keyword callable cls: A custom type or function that will be passed the direct response @@ -217,7 +217,7 @@ async def get200_model204_no_model_default_error202_none(self, **kwargs: Any) -> error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error202_none_request( template_url=self.get200_model204_no_model_default_error202_none.metadata["url"], @@ -247,7 +247,7 @@ async def get200_model204_no_model_default_error202_none(self, **kwargs: Any) -> get200_model204_no_model_default_error202_none.metadata = {"url": "/http/payloads/200/A/204/none/default/Error/response/202/none"} # type: ignore @distributed_trace_async - async def get200_model204_no_model_default_error400_valid(self, **kwargs: Any) -> Optional["_models.MyException"]: + async def get200_model204_no_model_default_error400_valid(self, **kwargs: Any) -> Optional[_models.MyException]: """Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -258,7 +258,7 @@ async def get200_model204_no_model_default_error400_valid(self, **kwargs: Any) - error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error400_valid_request( template_url=self.get200_model204_no_model_default_error400_valid.metadata["url"], @@ -290,7 +290,7 @@ async def get200_model204_no_model_default_error400_valid(self, **kwargs: Any) - @distributed_trace_async async def get200_model201_model_default_error200_valid( self, **kwargs: Any - ) -> Union["_models.MyException", "_models.B"]: + ) -> Union[_models.MyException, _models.B]: """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -301,7 +301,7 @@ async def get200_model201_model_default_error200_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.B"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.B]] request = build_get200_model201_model_default_error200_valid_request( template_url=self.get200_model201_model_default_error200_valid.metadata["url"], @@ -335,7 +335,7 @@ async def get200_model201_model_default_error200_valid( @distributed_trace_async async def get200_model201_model_default_error201_valid( self, **kwargs: Any - ) -> Union["_models.MyException", "_models.B"]: + ) -> Union[_models.MyException, _models.B]: """Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -346,7 +346,7 @@ async def get200_model201_model_default_error201_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.B"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.B]] request = build_get200_model201_model_default_error201_valid_request( template_url=self.get200_model201_model_default_error201_valid.metadata["url"], @@ -380,7 +380,7 @@ async def get200_model201_model_default_error201_valid( @distributed_trace_async async def get200_model201_model_default_error400_valid( self, **kwargs: Any - ) -> Union["_models.MyException", "_models.B"]: + ) -> Union[_models.MyException, _models.B]: """Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -391,7 +391,7 @@ async def get200_model201_model_default_error400_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.B"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.B]] request = build_get200_model201_model_default_error400_valid_request( template_url=self.get200_model201_model_default_error400_valid.metadata["url"], @@ -425,7 +425,7 @@ async def get200_model201_model_default_error400_valid( @distributed_trace_async async def get200_model_a201_model_c404_model_d_default_error200_valid( self, **kwargs: Any - ) -> Union["_models.MyException", "_models.C", "_models.D"]: + ) -> Union[_models.MyException, _models.C, _models.D]: """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -437,7 +437,7 @@ async def get200_model_a201_model_c404_model_d_default_error200_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error200_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error200_valid.metadata["url"], @@ -474,7 +474,7 @@ async def get200_model_a201_model_c404_model_d_default_error200_valid( @distributed_trace_async async def get200_model_a201_model_c404_model_d_default_error201_valid( self, **kwargs: Any - ) -> Union["_models.MyException", "_models.C", "_models.D"]: + ) -> Union[_models.MyException, _models.C, _models.D]: """Send a 200 response with valid payload: {'httpCode': '201'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -486,7 +486,7 @@ async def get200_model_a201_model_c404_model_d_default_error201_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error201_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error201_valid.metadata["url"], @@ -523,7 +523,7 @@ async def get200_model_a201_model_c404_model_d_default_error201_valid( @distributed_trace_async async def get200_model_a201_model_c404_model_d_default_error404_valid( self, **kwargs: Any - ) -> Union["_models.MyException", "_models.C", "_models.D"]: + ) -> Union[_models.MyException, _models.C, _models.D]: """Send a 200 response with valid payload: {'httpStatusCode': '404'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -535,7 +535,7 @@ async def get200_model_a201_model_c404_model_d_default_error404_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error404_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error404_valid.metadata["url"], @@ -572,7 +572,7 @@ async def get200_model_a201_model_c404_model_d_default_error404_valid( @distributed_trace_async async def get200_model_a201_model_c404_model_d_default_error400_valid( self, **kwargs: Any - ) -> Union["_models.MyException", "_models.C", "_models.D"]: + ) -> Union[_models.MyException, _models.C, _models.D]: """Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -584,7 +584,7 @@ async def get200_model_a201_model_c404_model_d_default_error400_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error400_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error400_valid.metadata["url"], @@ -874,7 +874,7 @@ async def get202_none204_none_default_none400_invalid( # pylint: disable=incons get202_none204_none_default_none400_invalid.metadata = {"url": "/http/payloads/202/none/204/none/default/none/response/400/invalid"} # type: ignore @distributed_trace_async - async def get_default_model_a200_valid(self, **kwargs: Any) -> "_models.MyException": + async def get_default_model_a200_valid(self, **kwargs: Any) -> _models.MyException: """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -885,7 +885,7 @@ async def get_default_model_a200_valid(self, **kwargs: Any) -> "_models.MyExcept error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get_default_model_a200_valid_request( template_url=self.get_default_model_a200_valid.metadata["url"], @@ -912,7 +912,7 @@ async def get_default_model_a200_valid(self, **kwargs: Any) -> "_models.MyExcept get_default_model_a200_valid.metadata = {"url": "/http/payloads/default/A/response/200/valid"} # type: ignore @distributed_trace_async - async def get_default_model_a200_none(self, **kwargs: Any) -> "_models.MyException": + async def get_default_model_a200_none(self, **kwargs: Any) -> _models.MyException: """Send a 200 response with no payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -923,7 +923,7 @@ async def get_default_model_a200_none(self, **kwargs: Any) -> "_models.MyExcepti error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get_default_model_a200_none_request( template_url=self.get_default_model_a200_none.metadata["url"], @@ -1164,7 +1164,7 @@ async def get_default_none400_none(self, **kwargs: Any) -> None: # pylint: disa get_default_none400_none.metadata = {"url": "/http/payloads/default/none/response/400/none"} # type: ignore @distributed_trace_async - async def get200_model_a200_none(self, **kwargs: Any) -> "_models.MyException": + async def get200_model_a200_none(self, **kwargs: Any) -> _models.MyException: """Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A. @@ -1176,7 +1176,7 @@ async def get200_model_a200_none(self, **kwargs: Any) -> "_models.MyException": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a200_none_request( template_url=self.get200_model_a200_none.metadata["url"], @@ -1203,7 +1203,7 @@ async def get200_model_a200_none(self, **kwargs: Any) -> "_models.MyException": get200_model_a200_none.metadata = {"url": "/http/payloads/200/A/response/200/none"} # type: ignore @distributed_trace_async - async def get200_model_a200_valid(self, **kwargs: Any) -> "_models.MyException": + async def get200_model_a200_valid(self, **kwargs: Any) -> _models.MyException: """Send a 200 response with payload {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1214,7 +1214,7 @@ async def get200_model_a200_valid(self, **kwargs: Any) -> "_models.MyException": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a200_valid_request( template_url=self.get200_model_a200_valid.metadata["url"], @@ -1241,7 +1241,7 @@ async def get200_model_a200_valid(self, **kwargs: Any) -> "_models.MyException": get200_model_a200_valid.metadata = {"url": "/http/payloads/200/A/response/200/valid"} # type: ignore @distributed_trace_async - async def get200_model_a200_invalid(self, **kwargs: Any) -> "_models.MyException": + async def get200_model_a200_invalid(self, **kwargs: Any) -> _models.MyException: """Send a 200 response with invalid payload {'statusCodeInvalid': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1252,7 +1252,7 @@ async def get200_model_a200_invalid(self, **kwargs: Any) -> "_models.MyException error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a200_invalid_request( template_url=self.get200_model_a200_invalid.metadata["url"], @@ -1279,7 +1279,7 @@ async def get200_model_a200_invalid(self, **kwargs: Any) -> "_models.MyException get200_model_a200_invalid.metadata = {"url": "/http/payloads/200/A/response/200/invalid"} # type: ignore @distributed_trace_async - async def get200_model_a400_none(self, **kwargs: Any) -> "_models.MyException": + async def get200_model_a400_none(self, **kwargs: Any) -> _models.MyException: """Send a 400 response with no payload client should treat as an http error with no error model. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1290,7 +1290,7 @@ async def get200_model_a400_none(self, **kwargs: Any) -> "_models.MyException": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a400_none_request( template_url=self.get200_model_a400_none.metadata["url"], @@ -1317,7 +1317,7 @@ async def get200_model_a400_none(self, **kwargs: Any) -> "_models.MyException": get200_model_a400_none.metadata = {"url": "/http/payloads/200/A/response/400/none"} # type: ignore @distributed_trace_async - async def get200_model_a400_valid(self, **kwargs: Any) -> "_models.MyException": + async def get200_model_a400_valid(self, **kwargs: Any) -> _models.MyException: """Send a 200 response with payload {'statusCode': '400'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1328,7 +1328,7 @@ async def get200_model_a400_valid(self, **kwargs: Any) -> "_models.MyException": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a400_valid_request( template_url=self.get200_model_a400_valid.metadata["url"], @@ -1355,7 +1355,7 @@ async def get200_model_a400_valid(self, **kwargs: Any) -> "_models.MyException": get200_model_a400_valid.metadata = {"url": "/http/payloads/200/A/response/400/valid"} # type: ignore @distributed_trace_async - async def get200_model_a400_invalid(self, **kwargs: Any) -> "_models.MyException": + async def get200_model_a400_invalid(self, **kwargs: Any) -> _models.MyException: """Send a 200 response with invalid payload {'statusCodeInvalid': '400'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1366,7 +1366,7 @@ async def get200_model_a400_invalid(self, **kwargs: Any) -> "_models.MyException error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a400_invalid_request( template_url=self.get200_model_a400_invalid.metadata["url"], @@ -1393,7 +1393,7 @@ async def get200_model_a400_invalid(self, **kwargs: Any) -> "_models.MyException get200_model_a400_invalid.metadata = {"url": "/http/payloads/200/A/response/400/invalid"} # type: ignore @distributed_trace_async - async def get200_model_a202_valid(self, **kwargs: Any) -> "_models.MyException": + async def get200_model_a202_valid(self, **kwargs: Any) -> _models.MyException: """Send a 202 response with payload {'statusCode': '202'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1404,7 +1404,7 @@ async def get200_model_a202_valid(self, **kwargs: Any) -> "_models.MyException": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a202_valid_request( template_url=self.get200_model_a202_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py index eaec57c33cc..ab13deaa0ca 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py @@ -691,7 +691,7 @@ def __init__(self, *args, **kwargs): def get200_model204_no_model_default_error200_valid( self, **kwargs # type: Any ): - # type: (...) -> Optional["_models.MyException"] + # type: (...) -> Optional[_models.MyException] """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -702,7 +702,7 @@ def get200_model204_no_model_default_error200_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error200_valid_request( template_url=self.get200_model204_no_model_default_error200_valid.metadata["url"], @@ -735,7 +735,7 @@ def get200_model204_no_model_default_error200_valid( def get200_model204_no_model_default_error204_valid( self, **kwargs # type: Any ): - # type: (...) -> Optional["_models.MyException"] + # type: (...) -> Optional[_models.MyException] """Send a 204 response with no payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -746,7 +746,7 @@ def get200_model204_no_model_default_error204_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error204_valid_request( template_url=self.get200_model204_no_model_default_error204_valid.metadata["url"], @@ -779,7 +779,7 @@ def get200_model204_no_model_default_error204_valid( def get200_model204_no_model_default_error201_invalid( self, **kwargs # type: Any ): - # type: (...) -> Optional["_models.MyException"] + # type: (...) -> Optional[_models.MyException] """Send a 201 response with valid payload: {'statusCode': '201'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -790,7 +790,7 @@ def get200_model204_no_model_default_error201_invalid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error201_invalid_request( template_url=self.get200_model204_no_model_default_error201_invalid.metadata["url"], @@ -823,7 +823,7 @@ def get200_model204_no_model_default_error201_invalid( def get200_model204_no_model_default_error202_none( self, **kwargs # type: Any ): - # type: (...) -> Optional["_models.MyException"] + # type: (...) -> Optional[_models.MyException] """Send a 202 response with no payload:. :keyword callable cls: A custom type or function that will be passed the direct response @@ -834,7 +834,7 @@ def get200_model204_no_model_default_error202_none( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error202_none_request( template_url=self.get200_model204_no_model_default_error202_none.metadata["url"], @@ -867,7 +867,7 @@ def get200_model204_no_model_default_error202_none( def get200_model204_no_model_default_error400_valid( self, **kwargs # type: Any ): - # type: (...) -> Optional["_models.MyException"] + # type: (...) -> Optional[_models.MyException] """Send a 400 response with valid error payload: {'status': 400, 'message': 'client error'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -878,7 +878,7 @@ def get200_model204_no_model_default_error400_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.MyException"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.MyException]] request = build_get200_model204_no_model_default_error400_valid_request( template_url=self.get200_model204_no_model_default_error400_valid.metadata["url"], @@ -911,7 +911,7 @@ def get200_model204_no_model_default_error400_valid( def get200_model201_model_default_error200_valid( self, **kwargs # type: Any ): - # type: (...) -> Union["_models.MyException", "_models.B"] + # type: (...) -> Union[_models.MyException, _models.B] """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -922,7 +922,7 @@ def get200_model201_model_default_error200_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.B"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.B]] request = build_get200_model201_model_default_error200_valid_request( template_url=self.get200_model201_model_default_error200_valid.metadata["url"], @@ -957,7 +957,7 @@ def get200_model201_model_default_error200_valid( def get200_model201_model_default_error201_valid( self, **kwargs # type: Any ): - # type: (...) -> Union["_models.MyException", "_models.B"] + # type: (...) -> Union[_models.MyException, _models.B] """Send a 201 response with valid payload: {'statusCode': '201', 'textStatusCode': 'Created'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -968,7 +968,7 @@ def get200_model201_model_default_error201_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.B"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.B]] request = build_get200_model201_model_default_error201_valid_request( template_url=self.get200_model201_model_default_error201_valid.metadata["url"], @@ -1003,7 +1003,7 @@ def get200_model201_model_default_error201_valid( def get200_model201_model_default_error400_valid( self, **kwargs # type: Any ): - # type: (...) -> Union["_models.MyException", "_models.B"] + # type: (...) -> Union[_models.MyException, _models.B] """Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1014,7 +1014,7 @@ def get200_model201_model_default_error400_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.B"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.B]] request = build_get200_model201_model_default_error400_valid_request( template_url=self.get200_model201_model_default_error400_valid.metadata["url"], @@ -1049,7 +1049,7 @@ def get200_model201_model_default_error400_valid( def get200_model_a201_model_c404_model_d_default_error200_valid( self, **kwargs # type: Any ): - # type: (...) -> Union["_models.MyException", "_models.C", "_models.D"] + # type: (...) -> Union[_models.MyException, _models.C, _models.D] """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1061,7 +1061,7 @@ def get200_model_a201_model_c404_model_d_default_error200_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error200_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error200_valid.metadata["url"], @@ -1099,7 +1099,7 @@ def get200_model_a201_model_c404_model_d_default_error200_valid( def get200_model_a201_model_c404_model_d_default_error201_valid( self, **kwargs # type: Any ): - # type: (...) -> Union["_models.MyException", "_models.C", "_models.D"] + # type: (...) -> Union[_models.MyException, _models.C, _models.D] """Send a 200 response with valid payload: {'httpCode': '201'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1111,7 +1111,7 @@ def get200_model_a201_model_c404_model_d_default_error201_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error201_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error201_valid.metadata["url"], @@ -1149,7 +1149,7 @@ def get200_model_a201_model_c404_model_d_default_error201_valid( def get200_model_a201_model_c404_model_d_default_error404_valid( self, **kwargs # type: Any ): - # type: (...) -> Union["_models.MyException", "_models.C", "_models.D"] + # type: (...) -> Union[_models.MyException, _models.C, _models.D] """Send a 200 response with valid payload: {'httpStatusCode': '404'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1161,7 +1161,7 @@ def get200_model_a201_model_c404_model_d_default_error404_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error404_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error404_valid.metadata["url"], @@ -1199,7 +1199,7 @@ def get200_model_a201_model_c404_model_d_default_error404_valid( def get200_model_a201_model_c404_model_d_default_error400_valid( self, **kwargs # type: Any ): - # type: (...) -> Union["_models.MyException", "_models.C", "_models.D"] + # type: (...) -> Union[_models.MyException, _models.C, _models.D] """Send a 400 response with valid payload: {'code': '400', 'message': 'client error'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1211,7 +1211,7 @@ def get200_model_a201_model_c404_model_d_default_error400_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Union["_models.MyException", "_models.C", "_models.D"]] + cls = kwargs.pop("cls", None) # type: ClsType[Union[_models.MyException, _models.C, _models.D]] request = build_get200_model_a201_model_c404_model_d_default_error400_valid_request( template_url=self.get200_model_a201_model_c404_model_d_default_error400_valid.metadata["url"], @@ -1511,7 +1511,7 @@ def get202_none204_none_default_none400_invalid( # pylint: disable=inconsistent def get_default_model_a200_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 200 response with valid payload: {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1522,7 +1522,7 @@ def get_default_model_a200_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get_default_model_a200_valid_request( template_url=self.get_default_model_a200_valid.metadata["url"], @@ -1552,7 +1552,7 @@ def get_default_model_a200_valid( def get_default_model_a200_none( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 200 response with no payload. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1563,7 +1563,7 @@ def get_default_model_a200_none( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get_default_model_a200_none_request( template_url=self.get_default_model_a200_none.metadata["url"], @@ -1817,7 +1817,7 @@ def get_default_none400_none( # pylint: disable=inconsistent-return-statements def get200_model_a200_none( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 200 response with no payload, when a payload is expected - client should return a null object of thde type for model A. @@ -1829,7 +1829,7 @@ def get200_model_a200_none( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a200_none_request( template_url=self.get200_model_a200_none.metadata["url"], @@ -1859,7 +1859,7 @@ def get200_model_a200_none( def get200_model_a200_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 200 response with payload {'statusCode': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1870,7 +1870,7 @@ def get200_model_a200_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a200_valid_request( template_url=self.get200_model_a200_valid.metadata["url"], @@ -1900,7 +1900,7 @@ def get200_model_a200_valid( def get200_model_a200_invalid( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 200 response with invalid payload {'statusCodeInvalid': '200'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1911,7 +1911,7 @@ def get200_model_a200_invalid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a200_invalid_request( template_url=self.get200_model_a200_invalid.metadata["url"], @@ -1941,7 +1941,7 @@ def get200_model_a200_invalid( def get200_model_a400_none( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 400 response with no payload client should treat as an http error with no error model. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1952,7 +1952,7 @@ def get200_model_a400_none( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a400_none_request( template_url=self.get200_model_a400_none.metadata["url"], @@ -1982,7 +1982,7 @@ def get200_model_a400_none( def get200_model_a400_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 200 response with payload {'statusCode': '400'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1993,7 +1993,7 @@ def get200_model_a400_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a400_valid_request( template_url=self.get200_model_a400_valid.metadata["url"], @@ -2023,7 +2023,7 @@ def get200_model_a400_valid( def get200_model_a400_invalid( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 200 response with invalid payload {'statusCodeInvalid': '400'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2034,7 +2034,7 @@ def get200_model_a400_invalid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a400_invalid_request( template_url=self.get200_model_a400_invalid.metadata["url"], @@ -2064,7 +2064,7 @@ def get200_model_a400_invalid( def get200_model_a202_valid( self, **kwargs # type: Any ): - # type: (...) -> "_models.MyException" + # type: (...) -> _models.MyException """Send a 202 response with payload {'statusCode': '202'}. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2075,7 +2075,7 @@ def get200_model_a202_valid( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.MyException"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.MyException] request = build_get200_model_a202_valid_request( template_url=self.get200_model_a202_valid.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py index b6e62a5c091..fcfcca19a5c 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py @@ -39,7 +39,7 @@ class MediaTypesClientOperationsMixin: @distributed_trace_async async def analyze_body( self, - input: Optional[Union[IO, "_models.SourcePath"]] = None, + input: Optional[Union[IO, _models.SourcePath]] = None, *, content_type: Optional[Union[str, "_models.ContentType"]] = "application/json", **kwargs: Any @@ -106,7 +106,7 @@ async def analyze_body( @distributed_trace_async async def analyze_body_no_accept_header( # pylint: disable=inconsistent-return-statements self, - input: Optional[Union[IO, "_models.SourcePath"]] = None, + input: Optional[Union[IO, _models.SourcePath]] = None, *, content_type: Optional[Union[str, "_models.ContentType"]] = "application/json", **kwargs: Any diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py index 36913f11d13..82efd45864a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/models/_media_types_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload""" #: Content Type 'application/pdf'. @@ -26,7 +25,7 @@ class ContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): APPLICATION_JSON = "application/json" -class ContentType1(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ContentType1(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type for upload""" #: Content Type 'application/json'. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py index 274eabe681e..2b06e18a07f 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py @@ -182,7 +182,7 @@ class MediaTypesClientOperationsMixin(object): @distributed_trace def analyze_body( self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> str @@ -251,7 +251,7 @@ def analyze_body( @distributed_trace def analyze_body_no_accept_header( # pylint: disable=inconsistent-return-statements self, - input=None, # type: Optional[Union[IO, "_models.SourcePath"]] + input=None, # type: Optional[Union[IO, _models.SourcePath]] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py index 95e70acc1e1..b2ec4dcb054 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py @@ -43,7 +43,7 @@ class AutoRestResourceFlatteningTestServiceOperationsMixin: @distributed_trace_async async def put_array( # pylint: disable=inconsistent-return-statements - self, resource_array: Optional[List["_models.Resource"]] = None, **kwargs: Any + self, resource_array: Optional[List[_models.Resource]] = None, **kwargs: Any ) -> None: """Put External Resource as an Array. @@ -89,7 +89,7 @@ async def put_array( # pylint: disable=inconsistent-return-statements put_array.metadata = {"url": "/model-flatten/array"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -100,7 +100,7 @@ async def get_array(self, **kwargs: Any) -> List["_models.FlattenedProduct"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.FlattenedProduct"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.FlattenedProduct]] request = build_get_array_request( template_url=self.get_array.metadata["url"], @@ -129,7 +129,7 @@ async def get_array(self, **kwargs: Any) -> List["_models.FlattenedProduct"]: @distributed_trace_async async def put_wrapped_array( # pylint: disable=inconsistent-return-statements - self, resource_array: Optional[List["_models.WrappedProduct"]] = None, **kwargs: Any + self, resource_array: Optional[List[_models.WrappedProduct]] = 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. @@ -176,7 +176,7 @@ async def put_wrapped_array( # pylint: disable=inconsistent-return-statements put_wrapped_array.metadata = {"url": "/model-flatten/wrappedarray"} # 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. @@ -188,7 +188,7 @@ async def get_wrapped_array(self, **kwargs: Any) -> List["_models.ProductWrapper error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.ProductWrapper"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.ProductWrapper]] request = build_get_wrapped_array_request( template_url=self.get_wrapped_array.metadata["url"], @@ -217,7 +217,7 @@ async def get_wrapped_array(self, **kwargs: Any) -> List["_models.ProductWrapper @distributed_trace_async async def put_dictionary( # pylint: disable=inconsistent-return-statements - self, resource_dictionary: Optional[Dict[str, "_models.FlattenedProduct"]] = None, **kwargs: Any + self, resource_dictionary: Optional[Dict[str, _models.FlattenedProduct]] = None, **kwargs: Any ) -> None: """Put External Resource as a Dictionary. @@ -263,7 +263,7 @@ async def put_dictionary( # pylint: disable=inconsistent-return-statements put_dictionary.metadata = {"url": "/model-flatten/dictionary"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -274,7 +274,7 @@ async def get_dictionary(self, **kwargs: Any) -> Dict[str, "_models.FlattenedPro error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.FlattenedProduct"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.FlattenedProduct]] request = build_get_dictionary_request( template_url=self.get_dictionary.metadata["url"], @@ -303,7 +303,7 @@ async def get_dictionary(self, **kwargs: Any) -> Dict[str, "_models.FlattenedPro @distributed_trace_async async def put_resource_collection( # pylint: disable=inconsistent-return-statements - self, resource_complex_object: Optional["_models.ResourceCollection"] = None, **kwargs: Any + self, resource_complex_object: Optional[_models.ResourceCollection] = None, **kwargs: Any ) -> None: """Put External Resource as a ResourceCollection. @@ -350,7 +350,7 @@ async def put_resource_collection( # pylint: disable=inconsistent-return-statem put_resource_collection.metadata = {"url": "/model-flatten/resourcecollection"} # type: ignore @distributed_trace_async - async def get_resource_collection(self, **kwargs: Any) -> "_models.ResourceCollection": + async def get_resource_collection(self, **kwargs: Any) -> _models.ResourceCollection: """Get External Resource as a ResourceCollection. :keyword callable cls: A custom type or function that will be passed the direct response @@ -361,7 +361,7 @@ async def get_resource_collection(self, **kwargs: Any) -> "_models.ResourceColle error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ResourceCollection"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ResourceCollection] request = build_get_resource_collection_request( template_url=self.get_resource_collection.metadata["url"], @@ -390,8 +390,8 @@ async def get_resource_collection(self, **kwargs: Any) -> "_models.ResourceColle @distributed_trace_async async def put_simple_product( - self, simple_body_product: Optional["_models.SimpleProduct"] = None, **kwargs: Any - ) -> "_models.SimpleProduct": + self, simple_body_product: Optional[_models.SimpleProduct] = None, **kwargs: Any + ) -> _models.SimpleProduct: """Put Simple Product with client flattening true on the model. :param simple_body_product: Simple body product to put. Default value is None. @@ -405,7 +405,7 @@ async def put_simple_product( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SimpleProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SimpleProduct] if simple_body_product is not None: _json = self._serialize.body(simple_body_product, "SimpleProduct") @@ -449,7 +449,7 @@ async def post_flattened_simple_product( generic_value: Optional[str] = None, odata_value: Optional[str] = None, **kwargs: Any - ) -> "_models.SimpleProduct": + ) -> _models.SimpleProduct: """Put Flattened Simple Product with client flattening true on the parameter. :param product_id: Unique identifier representing a specific product for a given latitude & @@ -476,7 +476,7 @@ async def post_flattened_simple_product( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SimpleProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SimpleProduct] _simple_body_product = _models.SimpleProduct( product_id=product_id, @@ -520,8 +520,8 @@ async def post_flattened_simple_product( @distributed_trace_async async def put_simple_product_with_grouping( - self, flatten_parameter_group: "_models.FlattenParameterGroup", **kwargs: Any - ) -> "_models.SimpleProduct": + self, flatten_parameter_group: _models.FlattenParameterGroup, **kwargs: Any + ) -> _models.SimpleProduct: """Put Simple Product with client flattening true on the model. :param flatten_parameter_group: Parameter group. @@ -535,7 +535,7 @@ async def put_simple_product_with_grouping( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SimpleProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SimpleProduct] _name = None _simple_body_product = None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_auto_rest_resource_flattening_test_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_auto_rest_resource_flattening_test_service_enums.py index 6fcec081198..d2182dbf19a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_auto_rest_resource_flattening_test_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_auto_rest_resource_flattening_test_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class FlattenedProductPropertiesProvisioningStateValues(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class FlattenedProductPropertiesProvisioningStateValues(str, Enum, metaclass=CaseInsensitiveEnumMeta): SUCCEEDED = "Succeeded" FAILED = "Failed" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py index 6b7724dca13..c00503a450a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py @@ -294,7 +294,7 @@ class AutoRestResourceFlatteningTestServiceOperationsMixin(object): @distributed_trace def put_array( # pylint: disable=inconsistent-return-statements self, - resource_array=None, # type: Optional[List["_models.Resource"]] + resource_array=None, # type: Optional[List[_models.Resource]] **kwargs # type: Any ): # type: (...) -> None @@ -345,7 +345,7 @@ def put_array( # pylint: disable=inconsistent-return-statements def get_array( self, **kwargs # type: Any ): - # type: (...) -> List["_models.FlattenedProduct"] + # type: (...) -> List[_models.FlattenedProduct] """Get External Resource as an Array. :keyword callable cls: A custom type or function that will be passed the direct response @@ -356,7 +356,7 @@ def get_array( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.FlattenedProduct"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.FlattenedProduct]] request = build_get_array_request( template_url=self.get_array.metadata["url"], @@ -386,7 +386,7 @@ def get_array( @distributed_trace def put_wrapped_array( # pylint: disable=inconsistent-return-statements self, - resource_array=None, # type: Optional[List["_models.WrappedProduct"]] + resource_array=None, # type: Optional[List[_models.WrappedProduct]] **kwargs # type: Any ): # type: (...) -> None @@ -438,7 +438,7 @@ def put_wrapped_array( # pylint: disable=inconsistent-return-statements def get_wrapped_array( self, **kwargs # type: Any ): - # type: (...) -> List["_models.ProductWrapper"] + # type: (...) -> 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. @@ -450,7 +450,7 @@ def get_wrapped_array( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.ProductWrapper"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.ProductWrapper]] request = build_get_wrapped_array_request( template_url=self.get_wrapped_array.metadata["url"], @@ -480,7 +480,7 @@ def get_wrapped_array( @distributed_trace def put_dictionary( # pylint: disable=inconsistent-return-statements self, - resource_dictionary=None, # type: Optional[Dict[str, "_models.FlattenedProduct"]] + resource_dictionary=None, # type: Optional[Dict[str, _models.FlattenedProduct]] **kwargs # type: Any ): # type: (...) -> None @@ -531,7 +531,7 @@ def put_dictionary( # pylint: disable=inconsistent-return-statements def get_dictionary( self, **kwargs # type: Any ): - # type: (...) -> Dict[str, "_models.FlattenedProduct"] + # type: (...) -> Dict[str, _models.FlattenedProduct] """Get External Resource as a Dictionary. :keyword callable cls: A custom type or function that will be passed the direct response @@ -542,7 +542,7 @@ def get_dictionary( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, "_models.FlattenedProduct"]] + cls = kwargs.pop("cls", None) # type: ClsType[Dict[str, _models.FlattenedProduct]] request = build_get_dictionary_request( template_url=self.get_dictionary.metadata["url"], @@ -572,7 +572,7 @@ def get_dictionary( @distributed_trace def put_resource_collection( # pylint: disable=inconsistent-return-statements self, - resource_complex_object=None, # type: Optional["_models.ResourceCollection"] + resource_complex_object=None, # type: Optional[_models.ResourceCollection] **kwargs # type: Any ): # type: (...) -> None @@ -624,7 +624,7 @@ def put_resource_collection( # pylint: disable=inconsistent-return-statements def get_resource_collection( self, **kwargs # type: Any ): - # type: (...) -> "_models.ResourceCollection" + # type: (...) -> _models.ResourceCollection """Get External Resource as a ResourceCollection. :keyword callable cls: A custom type or function that will be passed the direct response @@ -635,7 +635,7 @@ def get_resource_collection( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ResourceCollection"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ResourceCollection] request = build_get_resource_collection_request( template_url=self.get_resource_collection.metadata["url"], @@ -665,10 +665,10 @@ def get_resource_collection( @distributed_trace def put_simple_product( self, - simple_body_product=None, # type: Optional["_models.SimpleProduct"] + simple_body_product=None, # type: Optional[_models.SimpleProduct] **kwargs # type: Any ): - # type: (...) -> "_models.SimpleProduct" + # type: (...) -> _models.SimpleProduct """Put Simple Product with client flattening true on the model. :param simple_body_product: Simple body product to put. Default value is None. @@ -682,7 +682,7 @@ def put_simple_product( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SimpleProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SimpleProduct] if simple_body_product is not None: _json = self._serialize.body(simple_body_product, "SimpleProduct") @@ -727,7 +727,7 @@ def post_flattened_simple_product( odata_value=None, # type: Optional[str] **kwargs # type: Any ): - # type: (...) -> "_models.SimpleProduct" + # type: (...) -> _models.SimpleProduct """Put Flattened Simple Product with client flattening true on the parameter. :param product_id: Unique identifier representing a specific product for a given latitude & @@ -754,7 +754,7 @@ def post_flattened_simple_product( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SimpleProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SimpleProduct] _simple_body_product = _models.SimpleProduct( product_id=product_id, @@ -799,10 +799,10 @@ def post_flattened_simple_product( @distributed_trace def put_simple_product_with_grouping( self, - flatten_parameter_group, # type: "_models.FlattenParameterGroup" + flatten_parameter_group, # type: _models.FlattenParameterGroup **kwargs # type: Any ): - # type: (...) -> "_models.SimpleProduct" + # type: (...) -> _models.SimpleProduct """Put Simple Product with client flattening true on the model. :param flatten_parameter_group: Parameter group. @@ -816,7 +816,7 @@ def put_simple_product_with_grouping( error_map.update(kwargs.pop("error_map", {})) content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.SimpleProduct"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SimpleProduct] _name = None _simple_body_product = None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py index dadf0d04e59..9ba5fe411b6 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py @@ -41,7 +41,7 @@ class MultipleInheritanceServiceClientOperationsMixin: @distributed_trace_async - async def get_horse(self, **kwargs: Any) -> "_models.Horse": + async def get_horse(self, **kwargs: Any) -> _models.Horse: """Get a horse with name 'Fred' and isAShowHorse true. :keyword callable cls: A custom type or function that will be passed the direct response @@ -52,7 +52,7 @@ async def get_horse(self, **kwargs: Any) -> "_models.Horse": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Horse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Horse] request = build_get_horse_request( template_url=self.get_horse.metadata["url"], @@ -80,7 +80,7 @@ async def get_horse(self, **kwargs: Any) -> "_models.Horse": get_horse.metadata = {"url": "/multipleInheritance/horse"} # type: ignore @distributed_trace_async - async def put_horse(self, horse: "_models.Horse", **kwargs: Any) -> str: + async def put_horse(self, horse: _models.Horse, **kwargs: Any) -> str: """Put a horse with name 'General' and isAShowHorse false. :param horse: Put a horse with name 'General' and isAShowHorse false. @@ -125,7 +125,7 @@ async def put_horse(self, horse: "_models.Horse", **kwargs: Any) -> str: put_horse.metadata = {"url": "/multipleInheritance/horse"} # type: ignore @distributed_trace_async - async def get_pet(self, **kwargs: Any) -> "_models.Pet": + async def get_pet(self, **kwargs: Any) -> _models.Pet: """Get a pet with name 'Peanut'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -136,7 +136,7 @@ async def get_pet(self, **kwargs: Any) -> "_models.Pet": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Pet"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Pet] request = build_get_pet_request( template_url=self.get_pet.metadata["url"], @@ -210,7 +210,7 @@ async def put_pet(self, name: str, **kwargs: Any) -> str: put_pet.metadata = {"url": "/multipleInheritance/pet"} # type: ignore @distributed_trace_async - async def get_feline(self, **kwargs: Any) -> "_models.Feline": + async def get_feline(self, **kwargs: Any) -> _models.Feline: """Get a feline where meows and hisses are true. :keyword callable cls: A custom type or function that will be passed the direct response @@ -221,7 +221,7 @@ async def get_feline(self, **kwargs: Any) -> "_models.Feline": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Feline"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Feline] request = build_get_feline_request( template_url=self.get_feline.metadata["url"], @@ -249,7 +249,7 @@ async def get_feline(self, **kwargs: Any) -> "_models.Feline": get_feline.metadata = {"url": "/multipleInheritance/feline"} # type: ignore @distributed_trace_async - async def put_feline(self, feline: "_models.Feline", **kwargs: Any) -> str: + async def put_feline(self, feline: _models.Feline, **kwargs: Any) -> str: """Put a feline who hisses and doesn't meow. :param feline: Put a feline who hisses and doesn't meow. @@ -294,7 +294,7 @@ async def put_feline(self, feline: "_models.Feline", **kwargs: Any) -> str: put_feline.metadata = {"url": "/multipleInheritance/feline"} # type: ignore @distributed_trace_async - async def get_cat(self, **kwargs: Any) -> "_models.Cat": + async def get_cat(self, **kwargs: Any) -> _models.Cat: """Get a cat with name 'Whiskers' where likesMilk, meows, and hisses is true. :keyword callable cls: A custom type or function that will be passed the direct response @@ -305,7 +305,7 @@ async def get_cat(self, **kwargs: Any) -> "_models.Cat": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Cat"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Cat] request = build_get_cat_request( template_url=self.get_cat.metadata["url"], @@ -333,7 +333,7 @@ async def get_cat(self, **kwargs: Any) -> "_models.Cat": get_cat.metadata = {"url": "/multipleInheritance/cat"} # type: ignore @distributed_trace_async - async def put_cat(self, cat: "_models.Cat", **kwargs: Any) -> str: + async def put_cat(self, cat: _models.Cat, **kwargs: Any) -> str: """Put a cat with name 'Boots' where likesMilk and hisses is false, meows is true. :param cat: Put a cat with name 'Boots' where likesMilk and hisses is false, meows is true. @@ -378,7 +378,7 @@ async def put_cat(self, cat: "_models.Cat", **kwargs: Any) -> str: put_cat.metadata = {"url": "/multipleInheritance/cat"} # type: ignore @distributed_trace_async - async def get_kitten(self, **kwargs: Any) -> "_models.Kitten": + async def get_kitten(self, **kwargs: Any) -> _models.Kitten: """Get a kitten with name 'Gatito' where likesMilk and meows is true, and hisses and eatsMiceYet is false. @@ -390,7 +390,7 @@ async def get_kitten(self, **kwargs: Any) -> "_models.Kitten": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Kitten"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Kitten] request = build_get_kitten_request( template_url=self.get_kitten.metadata["url"], @@ -418,7 +418,7 @@ async def get_kitten(self, **kwargs: Any) -> "_models.Kitten": get_kitten.metadata = {"url": "/multipleInheritance/kitten"} # type: ignore @distributed_trace_async - async def put_kitten(self, kitten: "_models.Kitten", **kwargs: Any) -> str: + async def put_kitten(self, kitten: _models.Kitten, **kwargs: Any) -> str: """Put a kitten with name 'Kitty' where likesMilk and hisses is false, meows and eatsMiceYet is true. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py index ef4cccfde13..569fa9f6e0a 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py @@ -261,7 +261,7 @@ class MultipleInheritanceServiceClientOperationsMixin(object): def get_horse( self, **kwargs # type: Any ): - # type: (...) -> "_models.Horse" + # type: (...) -> _models.Horse """Get a horse with name 'Fred' and isAShowHorse true. :keyword callable cls: A custom type or function that will be passed the direct response @@ -272,7 +272,7 @@ def get_horse( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Horse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Horse] request = build_get_horse_request( template_url=self.get_horse.metadata["url"], @@ -302,7 +302,7 @@ def get_horse( @distributed_trace def put_horse( self, - horse, # type: "_models.Horse" + horse, # type: _models.Horse **kwargs # type: Any ): # type: (...) -> str @@ -353,7 +353,7 @@ def put_horse( def get_pet( self, **kwargs # type: Any ): - # type: (...) -> "_models.Pet" + # type: (...) -> _models.Pet """Get a pet with name 'Peanut'. :keyword callable cls: A custom type or function that will be passed the direct response @@ -364,7 +364,7 @@ def get_pet( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Pet"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Pet] request = build_get_pet_request( template_url=self.get_pet.metadata["url"], @@ -446,7 +446,7 @@ def put_pet( def get_feline( self, **kwargs # type: Any ): - # type: (...) -> "_models.Feline" + # type: (...) -> _models.Feline """Get a feline where meows and hisses are true. :keyword callable cls: A custom type or function that will be passed the direct response @@ -457,7 +457,7 @@ def get_feline( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Feline"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Feline] request = build_get_feline_request( template_url=self.get_feline.metadata["url"], @@ -487,7 +487,7 @@ def get_feline( @distributed_trace def put_feline( self, - feline, # type: "_models.Feline" + feline, # type: _models.Feline **kwargs # type: Any ): # type: (...) -> str @@ -538,7 +538,7 @@ def put_feline( def get_cat( self, **kwargs # type: Any ): - # type: (...) -> "_models.Cat" + # type: (...) -> _models.Cat """Get a cat with name 'Whiskers' where likesMilk, meows, and hisses is true. :keyword callable cls: A custom type or function that will be passed the direct response @@ -549,7 +549,7 @@ def get_cat( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Cat"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Cat] request = build_get_cat_request( template_url=self.get_cat.metadata["url"], @@ -579,7 +579,7 @@ def get_cat( @distributed_trace def put_cat( self, - cat, # type: "_models.Cat" + cat, # type: _models.Cat **kwargs # type: Any ): # type: (...) -> str @@ -630,7 +630,7 @@ def put_cat( def get_kitten( self, **kwargs # type: Any ): - # type: (...) -> "_models.Kitten" + # type: (...) -> _models.Kitten """Get a kitten with name 'Gatito' where likesMilk and meows is true, and hisses and eatsMiceYet is false. @@ -642,7 +642,7 @@ def get_kitten( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Kitten"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Kitten] request = build_get_kitten_request( template_url=self.get_kitten.metadata["url"], @@ -672,7 +672,7 @@ def get_kitten( @distributed_trace def put_kitten( self, - kitten, # type: "_models.Kitten" + kitten, # type: _models.Kitten **kwargs # type: Any ): # type: (...) -> str diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/models/_non_string_enums_client_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/models/_non_string_enums_client_enums.py index 8854d9960a9..d95798175c9 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/models/_non_string_enums_client_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/models/_non_string_enums_client_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class FloatEnum(with_metaclass(CaseInsensitiveEnumMeta, float, Enum)): +class FloatEnum(float, Enum, metaclass=CaseInsensitiveEnumMeta): """List of float enums""" TWO_HUNDRED4 = 200.4 @@ -21,7 +20,7 @@ class FloatEnum(with_metaclass(CaseInsensitiveEnumMeta, float, Enum)): FOUR_HUNDRED_TWENTY_NINE1 = 429.1 -class IntEnum(with_metaclass(CaseInsensitiveEnumMeta, int, Enum)): +class IntEnum(int, Enum, metaclass=CaseInsensitiveEnumMeta): """List of integer enums""" TWO_HUNDRED = 200 diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py index 6a710557f76..dbf68f73679 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py @@ -696,7 +696,7 @@ async def post_optional_string_header( # pylint: disable=inconsistent-return-st @distributed_trace_async async def post_required_class_parameter( # pylint: disable=inconsistent-return-statements - self, body_parameter: "_models.Product", **kwargs: Any + self, body_parameter: _models.Product, **kwargs: Any ) -> None: """Test explicitly required complex object. Please put null and the client library should throw before the request is sent. @@ -741,7 +741,7 @@ async def post_required_class_parameter( # pylint: disable=inconsistent-return- @distributed_trace_async async def post_optional_class_parameter( # pylint: disable=inconsistent-return-statements - self, body_parameter: Optional["_models.Product"] = None, **kwargs: Any + self, body_parameter: Optional[_models.Product] = None, **kwargs: Any ) -> None: """Test explicitly optional complex object. Please put null. @@ -788,7 +788,7 @@ async def post_optional_class_parameter( # pylint: disable=inconsistent-return- @distributed_trace_async async def post_required_class_property( # pylint: disable=inconsistent-return-statements - self, value: "_models.Product", **kwargs: Any + self, value: _models.Product, **kwargs: Any ) -> None: """Test explicitly required complex object. Please put a valid class-wrapper with 'value' = null and the client library should throw before the request is sent. @@ -834,7 +834,7 @@ async def post_required_class_property( # pylint: disable=inconsistent-return-s @distributed_trace_async async def post_optional_class_property( # pylint: disable=inconsistent-return-statements - self, value: Optional["_models.Product"] = None, **kwargs: Any + self, value: Optional[_models.Product] = None, **kwargs: Any ) -> None: """Test explicitly optional complex object. Please put a valid class-wrapper with 'value' = null. diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py index 17aaacbdbef..ce94ecff291 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py @@ -1294,7 +1294,7 @@ def post_optional_string_header( # pylint: disable=inconsistent-return-statemen @distributed_trace def post_required_class_parameter( # pylint: disable=inconsistent-return-statements self, - body_parameter, # type: "_models.Product" + body_parameter, # type: _models.Product **kwargs # type: Any ): # type: (...) -> None @@ -1342,7 +1342,7 @@ def post_required_class_parameter( # pylint: disable=inconsistent-return-statem @distributed_trace def post_optional_class_parameter( # pylint: disable=inconsistent-return-statements self, - body_parameter=None, # type: Optional["_models.Product"] + body_parameter=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None @@ -1392,7 +1392,7 @@ def post_optional_class_parameter( # pylint: disable=inconsistent-return-statem @distributed_trace def post_required_class_property( # pylint: disable=inconsistent-return-statements self, - value, # type: "_models.Product" + value, # type: _models.Product **kwargs # type: Any ): # type: (...) -> None @@ -1441,7 +1441,7 @@ def post_required_class_property( # pylint: disable=inconsistent-return-stateme @distributed_trace def post_optional_class_property( # pylint: disable=inconsistent-return-statements self, - value=None, # type: Optional["_models.Product"] + value=None, # type: Optional[_models.Product] **kwargs # type: Any ): # type: (...) -> None diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/models/_auto_rest_url_test_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/models/_auto_rest_url_test_service_enums.py index d0f75fd6965..73bcd35e8ad 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/models/_auto_rest_url_test_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/models/_auto_rest_url_test_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class UriColor(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class UriColor(str, Enum, metaclass=CaseInsensitiveEnumMeta): RED_COLOR = "red color" GREEN_COLOR = "green color" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py index 03041566762..f08d62c6afc 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py @@ -37,7 +37,7 @@ class AutoRestValidationTestOperationsMixin: @distributed_trace_async async def validation_of_method_parameters( self, resource_group_name: str, id: int, **kwargs: Any - ) -> "_models.Product": + ) -> _models.Product: """Validates input parameters on the method. See swagger for details. :param resource_group_name: Required string between 3 and 10 chars with pattern [a-zA-Z0-9]+. @@ -53,7 +53,7 @@ async def validation_of_method_parameters( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "1.0.0") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_validation_of_method_parameters_request( subscription_id=self._config.subscription_id, @@ -86,8 +86,8 @@ async def validation_of_method_parameters( @distributed_trace_async async def validation_of_body( - self, resource_group_name: str, id: int, body: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, resource_group_name: str, id: int, body: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: """Validates body parameters on the method. See swagger for details. :param resource_group_name: Required string between 3 and 10 chars with pattern [a-zA-Z0-9]+. @@ -106,7 +106,7 @@ async def validation_of_body( api_version = kwargs.pop("api_version", "1.0.0") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if body is not None: _json = self._serialize.body(body, "Product") @@ -185,8 +185,8 @@ async def get_with_constant_in_path(self, **kwargs: Any) -> None: # pylint: dis @distributed_trace_async async def post_with_constant_in_body( - self, body: Optional["_models.Product"] = None, **kwargs: Any - ) -> "_models.Product": + self, body: Optional[_models.Product] = None, **kwargs: Any + ) -> _models.Product: """post_with_constant_in_body. :param body: Default value is None. @@ -204,7 +204,7 @@ async def post_with_constant_in_body( constant_param = kwargs.pop("constant_param", "constant") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if body is not None: _json = self._serialize.body(body, "Product") diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py index 3400bb437ac..c66f6fb1c63 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py @@ -171,7 +171,7 @@ def validation_of_method_parameters( id, # type: int **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product """Validates input parameters on the method. See swagger for details. :param resource_group_name: Required string between 3 and 10 chars with pattern [a-zA-Z0-9]+. @@ -187,7 +187,7 @@ def validation_of_method_parameters( error_map.update(kwargs.pop("error_map", {})) api_version = kwargs.pop("api_version", "1.0.0") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] request = build_validation_of_method_parameters_request( subscription_id=self._config.subscription_id, @@ -223,10 +223,10 @@ def validation_of_body( self, resource_group_name, # type: str id, # type: int - body=None, # type: Optional["_models.Product"] + body=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product """Validates body parameters on the method. See swagger for details. :param resource_group_name: Required string between 3 and 10 chars with pattern [a-zA-Z0-9]+. @@ -245,7 +245,7 @@ def validation_of_body( api_version = kwargs.pop("api_version", "1.0.0") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if body is not None: _json = self._serialize.body(body, "Product") @@ -328,10 +328,10 @@ def get_with_constant_in_path( # pylint: disable=inconsistent-return-statements @distributed_trace def post_with_constant_in_body( self, - body=None, # type: Optional["_models.Product"] + body=None, # type: Optional[_models.Product] **kwargs # type: Any ): - # type: (...) -> "_models.Product" + # type: (...) -> _models.Product """post_with_constant_in_body. :param body: Default value is None. @@ -349,7 +349,7 @@ def post_with_constant_in_body( constant_param = kwargs.pop("constant_param", "constant") # type: str content_type = kwargs.pop("content_type", "application/json") # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType["_models.Product"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Product] if body is not None: _json = self._serialize.body(body, "Product") diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py index 780833ccd32..dc9da22e46c 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py @@ -83,7 +83,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_complex_type_ref_no_meta(self, **kwargs: Any) -> "_models.RootWithRefAndNoMeta": + async def get_complex_type_ref_no_meta(self, **kwargs: Any) -> _models.RootWithRefAndNoMeta: """Get a complex type that has a ref to a complex type with no XML node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -94,7 +94,7 @@ async def get_complex_type_ref_no_meta(self, **kwargs: Any) -> "_models.RootWith error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.RootWithRefAndNoMeta"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.RootWithRefAndNoMeta] request = build_get_complex_type_ref_no_meta_request( template_url=self.get_complex_type_ref_no_meta.metadata["url"], @@ -122,7 +122,7 @@ async def get_complex_type_ref_no_meta(self, **kwargs: Any) -> "_models.RootWith @distributed_trace_async async def put_complex_type_ref_no_meta( # pylint: disable=inconsistent-return-statements - self, model: "_models.RootWithRefAndNoMeta", **kwargs: Any + self, model: _models.RootWithRefAndNoMeta, **kwargs: Any ) -> None: """Puts a complex type that has a ref to a complex type with no XML node. @@ -164,7 +164,7 @@ async def put_complex_type_ref_no_meta( # pylint: disable=inconsistent-return-s put_complex_type_ref_no_meta.metadata = {"url": "/xml/complex-type-ref-no-meta"} # type: ignore @distributed_trace_async - async def get_complex_type_ref_with_meta(self, **kwargs: Any) -> "_models.RootWithRefAndMeta": + async def get_complex_type_ref_with_meta(self, **kwargs: Any) -> _models.RootWithRefAndMeta: """Get a complex type that has a ref to a complex type with XML node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -175,7 +175,7 @@ async def get_complex_type_ref_with_meta(self, **kwargs: Any) -> "_models.RootWi error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.RootWithRefAndMeta"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.RootWithRefAndMeta] request = build_get_complex_type_ref_with_meta_request( template_url=self.get_complex_type_ref_with_meta.metadata["url"], @@ -203,7 +203,7 @@ async def get_complex_type_ref_with_meta(self, **kwargs: Any) -> "_models.RootWi @distributed_trace_async async def put_complex_type_ref_with_meta( # pylint: disable=inconsistent-return-statements - self, model: "_models.RootWithRefAndMeta", **kwargs: Any + self, model: _models.RootWithRefAndMeta, **kwargs: Any ) -> None: """Puts a complex type that has a ref to a complex type with XML node. @@ -245,7 +245,7 @@ async def put_complex_type_ref_with_meta( # pylint: disable=inconsistent-return put_complex_type_ref_with_meta.metadata = {"url": "/xml/complex-type-ref-with-meta"} # type: ignore @distributed_trace_async - async def get_simple(self, **kwargs: Any) -> "_models.Slideshow": + async def get_simple(self, **kwargs: Any) -> _models.Slideshow: """Get a simple XML document. :keyword callable cls: A custom type or function that will be passed the direct response @@ -256,7 +256,7 @@ async def get_simple(self, **kwargs: Any) -> "_models.Slideshow": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Slideshow"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Slideshow] request = build_get_simple_request( template_url=self.get_simple.metadata["url"], @@ -285,7 +285,7 @@ async def get_simple(self, **kwargs: Any) -> "_models.Slideshow": @distributed_trace_async async def put_simple( # pylint: disable=inconsistent-return-statements - self, slideshow: "_models.Slideshow", **kwargs: Any + self, slideshow: _models.Slideshow, **kwargs: Any ) -> None: """Put a simple XML document. @@ -328,7 +328,7 @@ async def put_simple( # pylint: disable=inconsistent-return-statements put_simple.metadata = {"url": "/xml/simple"} # type: ignore @distributed_trace_async - async def get_wrapped_lists(self, **kwargs: Any) -> "_models.AppleBarrel": + async def get_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: """Get an XML document with multiple wrapped lists. :keyword callable cls: A custom type or function that will be passed the direct response @@ -339,7 +339,7 @@ async def get_wrapped_lists(self, **kwargs: Any) -> "_models.AppleBarrel": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.AppleBarrel"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.AppleBarrel] request = build_get_wrapped_lists_request( template_url=self.get_wrapped_lists.metadata["url"], @@ -367,7 +367,7 @@ async def get_wrapped_lists(self, **kwargs: Any) -> "_models.AppleBarrel": @distributed_trace_async async def put_wrapped_lists( # pylint: disable=inconsistent-return-statements - self, wrapped_lists: "_models.AppleBarrel", **kwargs: Any + self, wrapped_lists: _models.AppleBarrel, **kwargs: Any ) -> None: """Put an XML document with multiple wrapped lists. @@ -447,7 +447,7 @@ async def get_headers(self, **kwargs: Any) -> None: # pylint: disable=inconsist get_headers.metadata = {"url": "/xml/headers"} # type: ignore @distributed_trace_async - async def get_empty_list(self, **kwargs: Any) -> "_models.Slideshow": + async def get_empty_list(self, **kwargs: Any) -> _models.Slideshow: """Get an empty list. :keyword callable cls: A custom type or function that will be passed the direct response @@ -458,7 +458,7 @@ async def get_empty_list(self, **kwargs: Any) -> "_models.Slideshow": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Slideshow"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Slideshow] request = build_get_empty_list_request( template_url=self.get_empty_list.metadata["url"], @@ -486,7 +486,7 @@ async def get_empty_list(self, **kwargs: Any) -> "_models.Slideshow": @distributed_trace_async async def put_empty_list( # pylint: disable=inconsistent-return-statements - self, slideshow: "_models.Slideshow", **kwargs: Any + self, slideshow: _models.Slideshow, **kwargs: Any ) -> None: """Puts an empty list. @@ -528,7 +528,7 @@ async def put_empty_list( # pylint: disable=inconsistent-return-statements put_empty_list.metadata = {"url": "/xml/empty-list"} # type: ignore @distributed_trace_async - async def get_empty_wrapped_lists(self, **kwargs: Any) -> "_models.AppleBarrel": + async def get_empty_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: """Gets some empty wrapped lists. :keyword callable cls: A custom type or function that will be passed the direct response @@ -539,7 +539,7 @@ async def get_empty_wrapped_lists(self, **kwargs: Any) -> "_models.AppleBarrel": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.AppleBarrel"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.AppleBarrel] request = build_get_empty_wrapped_lists_request( template_url=self.get_empty_wrapped_lists.metadata["url"], @@ -567,7 +567,7 @@ async def get_empty_wrapped_lists(self, **kwargs: Any) -> "_models.AppleBarrel": @distributed_trace_async async def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statements - self, apple_barrel: "_models.AppleBarrel", **kwargs: Any + self, apple_barrel: _models.AppleBarrel, **kwargs: Any ) -> None: """Puts some empty wrapped lists. @@ -609,7 +609,7 @@ async def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statem put_empty_wrapped_lists.metadata = {"url": "/xml/empty-wrapped-lists"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -620,7 +620,7 @@ async def get_root_list(self, **kwargs: Any) -> List["_models.Banana"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Banana"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Banana]] request = build_get_root_list_request( template_url=self.get_root_list.metadata["url"], @@ -648,7 +648,7 @@ async def get_root_list(self, **kwargs: Any) -> List["_models.Banana"]: @distributed_trace_async async 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. @@ -691,7 +691,7 @@ async def put_root_list( # pylint: disable=inconsistent-return-statements put_root_list.metadata = {"url": "/xml/root-list"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -702,7 +702,7 @@ async def get_root_list_single_item(self, **kwargs: Any) -> List["_models.Banana error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Banana"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Banana]] request = build_get_root_list_single_item_request( template_url=self.get_root_list_single_item.metadata["url"], @@ -730,7 +730,7 @@ async def get_root_list_single_item(self, **kwargs: Any) -> List["_models.Banana @distributed_trace_async async 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. @@ -773,7 +773,7 @@ async def put_root_list_single_item( # pylint: disable=inconsistent-return-stat put_root_list_single_item.metadata = {"url": "/xml/root-list-single-item"} # 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. :keyword callable cls: A custom type or function that will be passed the direct response @@ -784,7 +784,7 @@ async def get_empty_root_list(self, **kwargs: Any) -> List["_models.Banana"]: error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Banana"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Banana]] request = build_get_empty_root_list_request( template_url=self.get_empty_root_list.metadata["url"], @@ -812,7 +812,7 @@ async def get_empty_root_list(self, **kwargs: Any) -> List["_models.Banana"]: @distributed_trace_async async 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. @@ -855,7 +855,7 @@ async def put_empty_root_list( # pylint: disable=inconsistent-return-statements put_empty_root_list.metadata = {"url": "/xml/empty-root-list"} # type: ignore @distributed_trace_async - async def get_empty_child_element(self, **kwargs: Any) -> "_models.Banana": + async def get_empty_child_element(self, **kwargs: Any) -> _models.Banana: """Gets an XML document with an empty child element. :keyword callable cls: A custom type or function that will be passed the direct response @@ -866,7 +866,7 @@ async def get_empty_child_element(self, **kwargs: Any) -> "_models.Banana": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Banana"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Banana] request = build_get_empty_child_element_request( template_url=self.get_empty_child_element.metadata["url"], @@ -894,7 +894,7 @@ async def get_empty_child_element(self, **kwargs: Any) -> "_models.Banana": @distributed_trace_async async def put_empty_child_element( # pylint: disable=inconsistent-return-statements - self, banana: "_models.Banana", **kwargs: Any + self, banana: _models.Banana, **kwargs: Any ) -> None: """Puts a value with an empty child element. @@ -936,7 +936,7 @@ async def put_empty_child_element( # pylint: disable=inconsistent-return-statem put_empty_child_element.metadata = {"url": "/xml/empty-child-element"} # type: ignore @distributed_trace_async - async def list_containers(self, **kwargs: Any) -> "_models.ListContainersResponse": + async def list_containers(self, **kwargs: Any) -> _models.ListContainersResponse: """Lists containers in a storage account. :keyword comp: Default value is "list". Note that overriding this default value may result in @@ -951,7 +951,7 @@ async def list_containers(self, **kwargs: Any) -> "_models.ListContainersRespons error_map.update(kwargs.pop("error_map", {})) comp = kwargs.pop("comp", "list") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.ListContainersResponse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ListContainersResponse] request = build_list_containers_request( comp=comp, @@ -979,7 +979,7 @@ async def list_containers(self, **kwargs: Any) -> "_models.ListContainersRespons list_containers.metadata = {"url": "/xml/"} # type: ignore @distributed_trace_async - async def get_service_properties(self, **kwargs: Any) -> "_models.StorageServiceProperties": + async def get_service_properties(self, **kwargs: Any) -> _models.StorageServiceProperties: """Gets storage service properties. :keyword comp: Default value is "properties". Note that overriding this default value may @@ -998,7 +998,7 @@ async def get_service_properties(self, **kwargs: Any) -> "_models.StorageService comp = kwargs.pop("comp", "properties") # type: str restype = kwargs.pop("restype", "service") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageServiceProperties"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageServiceProperties] request = build_get_service_properties_request( comp=comp, @@ -1028,7 +1028,7 @@ async def get_service_properties(self, **kwargs: Any) -> "_models.StorageService @distributed_trace_async async def put_service_properties( # pylint: disable=inconsistent-return-statements - self, properties: "_models.StorageServiceProperties", **kwargs: Any + self, properties: _models.StorageServiceProperties, **kwargs: Any ) -> None: """Puts storage service properties. @@ -1080,7 +1080,7 @@ async def put_service_properties( # pylint: disable=inconsistent-return-stateme put_service_properties.metadata = {"url": "/xml/"} # 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. :keyword comp: Default value is "acl". Note that overriding this default value may result in @@ -1099,7 +1099,7 @@ async def get_acls(self, **kwargs: Any) -> List["_models.SignedIdentifier"]: comp = kwargs.pop("comp", "acl") # type: str restype = kwargs.pop("restype", "container") # type: str - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.SignedIdentifier"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.SignedIdentifier]] request = build_get_acls_request( comp=comp, @@ -1129,7 +1129,7 @@ async def get_acls(self, **kwargs: Any) -> List["_models.SignedIdentifier"]: @distributed_trace_async async 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. @@ -1184,7 +1184,7 @@ async def put_acls( # pylint: disable=inconsistent-return-statements put_acls.metadata = {"url": "/xml/mycontainer"} # type: ignore @distributed_trace_async - async def list_blobs(self, **kwargs: Any) -> "_models.ListBlobsResponse": + async def list_blobs(self, **kwargs: Any) -> _models.ListBlobsResponse: """Lists blobs in a storage container. :keyword comp: Default value is "list". Note that overriding this default value may result in @@ -1203,7 +1203,7 @@ async def list_blobs(self, **kwargs: Any) -> "_models.ListBlobsResponse": comp = kwargs.pop("comp", "list") # type: str restype = kwargs.pop("restype", "container") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.ListBlobsResponse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ListBlobsResponse] request = build_list_blobs_request( comp=comp, @@ -1277,7 +1277,7 @@ async def json_input( # pylint: disable=inconsistent-return-statements json_input.metadata = {"url": "/xml/jsoninput"} # type: ignore @distributed_trace_async - async def json_output(self, **kwargs: Any) -> "_models.JSONOutput": + async def json_output(self, **kwargs: Any) -> _models.JSONOutput: """A Swagger with XML that has one operation that returns JSON. ID number 42. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1288,7 +1288,7 @@ async def json_output(self, **kwargs: Any) -> "_models.JSONOutput": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.JSONOutput"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.JSONOutput] request = build_json_output_request( template_url=self.json_output.metadata["url"], @@ -1315,7 +1315,7 @@ async def json_output(self, **kwargs: Any) -> "_models.JSONOutput": json_output.metadata = {"url": "/xml/jsonoutput"} # type: ignore @distributed_trace_async - async def get_xms_text(self, **kwargs: Any) -> "_models.ObjectWithXMsTextProperty": + async def get_xms_text(self, **kwargs: Any) -> _models.ObjectWithXMsTextProperty: """Get back an XML object with an x-ms-text property, which should translate to the returned object's 'language' property being 'english' and its 'content' property being 'I am text'. @@ -1327,7 +1327,7 @@ async def get_xms_text(self, **kwargs: Any) -> "_models.ObjectWithXMsTextPropert error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ObjectWithXMsTextProperty"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ObjectWithXMsTextProperty] request = build_get_xms_text_request( template_url=self.get_xms_text.metadata["url"], @@ -1354,7 +1354,7 @@ async def get_xms_text(self, **kwargs: Any) -> "_models.ObjectWithXMsTextPropert get_xms_text.metadata = {"url": "/xml/x-ms-text"} # type: ignore @distributed_trace_async - async def get_bytes(self, **kwargs: Any) -> "_models.ModelWithByteProperty": + async def get_bytes(self, **kwargs: Any) -> _models.ModelWithByteProperty: """Get an XML document with binary property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1365,7 +1365,7 @@ async def get_bytes(self, **kwargs: Any) -> "_models.ModelWithByteProperty": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ModelWithByteProperty"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ModelWithByteProperty] request = build_get_bytes_request( template_url=self.get_bytes.metadata["url"], @@ -1438,7 +1438,7 @@ async def put_binary( # pylint: disable=inconsistent-return-statements put_binary.metadata = {"url": "/xml/bytes"} # type: ignore @distributed_trace_async - async def get_uri(self, **kwargs: Any) -> "_models.ModelWithUrlProperty": + async def get_uri(self, **kwargs: Any) -> _models.ModelWithUrlProperty: """Get an XML document with uri property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1449,7 +1449,7 @@ async def get_uri(self, **kwargs: Any) -> "_models.ModelWithUrlProperty": error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ModelWithUrlProperty"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ModelWithUrlProperty] request = build_get_uri_request( template_url=self.get_uri.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_auto_rest_swagger_batxml_service_enums.py b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_auto_rest_swagger_batxml_service_enums.py index 598c7ea0494..7e1729bf0e7 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_auto_rest_swagger_batxml_service_enums.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_auto_rest_swagger_batxml_service_enums.py @@ -7,11 +7,10 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class AccessTier(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class AccessTier(str, Enum, metaclass=CaseInsensitiveEnumMeta): P4 = "P4" P6 = "P6" @@ -25,20 +24,20 @@ class AccessTier(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): ARCHIVE = "Archive" -class ArchiveStatus(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ArchiveStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta): REHYDRATE_PENDING_TO_HOT = "rehydrate-pending-to-hot" REHYDRATE_PENDING_TO_COOL = "rehydrate-pending-to-cool" -class BlobType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class BlobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): BLOCK_BLOB = "BlockBlob" PAGE_BLOB = "PageBlob" APPEND_BLOB = "AppendBlob" -class CopyStatusType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class CopyStatusType(str, Enum, metaclass=CaseInsensitiveEnumMeta): PENDING = "pending" SUCCESS = "success" @@ -46,13 +45,13 @@ class CopyStatusType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): FAILED = "failed" -class LeaseDurationType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class LeaseDurationType(str, Enum, metaclass=CaseInsensitiveEnumMeta): INFINITE = "infinite" FIXED = "fixed" -class LeaseStateType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class LeaseStateType(str, Enum, metaclass=CaseInsensitiveEnumMeta): AVAILABLE = "available" LEASED = "leased" @@ -61,13 +60,13 @@ class LeaseStateType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): BROKEN = "broken" -class LeaseStatusType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class LeaseStatusType(str, Enum, metaclass=CaseInsensitiveEnumMeta): LOCKED = "locked" UNLOCKED = "unlocked" -class PublicAccessType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class PublicAccessType(str, Enum, metaclass=CaseInsensitiveEnumMeta): CONTAINER = "container" BLOB = "blob" diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py index d8733fb8706..28cb43fa220 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py @@ -12,8 +12,6 @@ from azure.core.exceptions import HttpResponseError import msrest.serialization -from ._auto_rest_swagger_batxml_service_enums import * - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports import __init__ as _models diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py index 429ea49c605..6b3cd1c4b3b 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py @@ -821,7 +821,7 @@ def __init__(self, *args, **kwargs): def get_complex_type_ref_no_meta( self, **kwargs # type: Any ): - # type: (...) -> "_models.RootWithRefAndNoMeta" + # type: (...) -> _models.RootWithRefAndNoMeta """Get a complex type that has a ref to a complex type with no XML node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -832,7 +832,7 @@ def get_complex_type_ref_no_meta( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.RootWithRefAndNoMeta"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.RootWithRefAndNoMeta] request = build_get_complex_type_ref_no_meta_request( template_url=self.get_complex_type_ref_no_meta.metadata["url"], @@ -861,7 +861,7 @@ def get_complex_type_ref_no_meta( @distributed_trace def put_complex_type_ref_no_meta( # pylint: disable=inconsistent-return-statements self, - model, # type: "_models.RootWithRefAndNoMeta" + model, # type: _models.RootWithRefAndNoMeta **kwargs # type: Any ): # type: (...) -> None @@ -908,7 +908,7 @@ def put_complex_type_ref_no_meta( # pylint: disable=inconsistent-return-stateme def get_complex_type_ref_with_meta( self, **kwargs # type: Any ): - # type: (...) -> "_models.RootWithRefAndMeta" + # type: (...) -> _models.RootWithRefAndMeta """Get a complex type that has a ref to a complex type with XML node. :keyword callable cls: A custom type or function that will be passed the direct response @@ -919,7 +919,7 @@ def get_complex_type_ref_with_meta( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.RootWithRefAndMeta"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.RootWithRefAndMeta] request = build_get_complex_type_ref_with_meta_request( template_url=self.get_complex_type_ref_with_meta.metadata["url"], @@ -948,7 +948,7 @@ def get_complex_type_ref_with_meta( @distributed_trace def put_complex_type_ref_with_meta( # pylint: disable=inconsistent-return-statements self, - model, # type: "_models.RootWithRefAndMeta" + model, # type: _models.RootWithRefAndMeta **kwargs # type: Any ): # type: (...) -> None @@ -995,7 +995,7 @@ def put_complex_type_ref_with_meta( # pylint: disable=inconsistent-return-state def get_simple( self, **kwargs # type: Any ): - # type: (...) -> "_models.Slideshow" + # type: (...) -> _models.Slideshow """Get a simple XML document. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1006,7 +1006,7 @@ def get_simple( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Slideshow"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Slideshow] request = build_get_simple_request( template_url=self.get_simple.metadata["url"], @@ -1036,7 +1036,7 @@ def get_simple( @distributed_trace def put_simple( # pylint: disable=inconsistent-return-statements self, - slideshow, # type: "_models.Slideshow" + slideshow, # type: _models.Slideshow **kwargs # type: Any ): # type: (...) -> None @@ -1084,7 +1084,7 @@ def put_simple( # pylint: disable=inconsistent-return-statements def get_wrapped_lists( self, **kwargs # type: Any ): - # type: (...) -> "_models.AppleBarrel" + # type: (...) -> _models.AppleBarrel """Get an XML document with multiple wrapped lists. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1095,7 +1095,7 @@ def get_wrapped_lists( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.AppleBarrel"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.AppleBarrel] request = build_get_wrapped_lists_request( template_url=self.get_wrapped_lists.metadata["url"], @@ -1124,7 +1124,7 @@ def get_wrapped_lists( @distributed_trace def put_wrapped_lists( # pylint: disable=inconsistent-return-statements self, - wrapped_lists, # type: "_models.AppleBarrel" + wrapped_lists, # type: _models.AppleBarrel **kwargs # type: Any ): # type: (...) -> None @@ -1212,7 +1212,7 @@ def get_headers( # pylint: disable=inconsistent-return-statements def get_empty_list( self, **kwargs # type: Any ): - # type: (...) -> "_models.Slideshow" + # type: (...) -> _models.Slideshow """Get an empty list. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1223,7 +1223,7 @@ def get_empty_list( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Slideshow"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Slideshow] request = build_get_empty_list_request( template_url=self.get_empty_list.metadata["url"], @@ -1252,7 +1252,7 @@ def get_empty_list( @distributed_trace def put_empty_list( # pylint: disable=inconsistent-return-statements self, - slideshow, # type: "_models.Slideshow" + slideshow, # type: _models.Slideshow **kwargs # type: Any ): # type: (...) -> None @@ -1299,7 +1299,7 @@ def put_empty_list( # pylint: disable=inconsistent-return-statements def get_empty_wrapped_lists( self, **kwargs # type: Any ): - # type: (...) -> "_models.AppleBarrel" + # type: (...) -> _models.AppleBarrel """Gets some empty wrapped lists. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1310,7 +1310,7 @@ def get_empty_wrapped_lists( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.AppleBarrel"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.AppleBarrel] request = build_get_empty_wrapped_lists_request( template_url=self.get_empty_wrapped_lists.metadata["url"], @@ -1339,7 +1339,7 @@ def get_empty_wrapped_lists( @distributed_trace def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statements self, - apple_barrel, # type: "_models.AppleBarrel" + apple_barrel, # type: _models.AppleBarrel **kwargs # type: Any ): # type: (...) -> None @@ -1386,7 +1386,7 @@ def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statements def get_root_list( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Banana"] + # type: (...) -> List[_models.Banana] """Gets a list as the root element. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1397,7 +1397,7 @@ def get_root_list( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Banana"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Banana]] request = build_get_root_list_request( template_url=self.get_root_list.metadata["url"], @@ -1426,7 +1426,7 @@ def get_root_list( @distributed_trace def put_root_list( # pylint: disable=inconsistent-return-statements self, - bananas, # type: List["_models.Banana"] + bananas, # type: List[_models.Banana] **kwargs # type: Any ): # type: (...) -> None @@ -1474,7 +1474,7 @@ def put_root_list( # pylint: disable=inconsistent-return-statements def get_root_list_single_item( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Banana"] + # type: (...) -> List[_models.Banana] """Gets a list with a single item. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1485,7 +1485,7 @@ def get_root_list_single_item( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Banana"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Banana]] request = build_get_root_list_single_item_request( template_url=self.get_root_list_single_item.metadata["url"], @@ -1514,7 +1514,7 @@ def get_root_list_single_item( @distributed_trace def put_root_list_single_item( # pylint: disable=inconsistent-return-statements self, - bananas, # type: List["_models.Banana"] + bananas, # type: List[_models.Banana] **kwargs # type: Any ): # type: (...) -> None @@ -1562,7 +1562,7 @@ def put_root_list_single_item( # pylint: disable=inconsistent-return-statements def get_empty_root_list( self, **kwargs # type: Any ): - # type: (...) -> List["_models.Banana"] + # type: (...) -> List[_models.Banana] """Gets an empty list as the root element. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1573,7 +1573,7 @@ def get_empty_root_list( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.Banana"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.Banana]] request = build_get_empty_root_list_request( template_url=self.get_empty_root_list.metadata["url"], @@ -1602,7 +1602,7 @@ def get_empty_root_list( @distributed_trace def put_empty_root_list( # pylint: disable=inconsistent-return-statements self, - bananas, # type: List["_models.Banana"] + bananas, # type: List[_models.Banana] **kwargs # type: Any ): # type: (...) -> None @@ -1650,7 +1650,7 @@ def put_empty_root_list( # pylint: disable=inconsistent-return-statements def get_empty_child_element( self, **kwargs # type: Any ): - # type: (...) -> "_models.Banana" + # type: (...) -> _models.Banana """Gets an XML document with an empty child element. :keyword callable cls: A custom type or function that will be passed the direct response @@ -1661,7 +1661,7 @@ def get_empty_child_element( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.Banana"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Banana] request = build_get_empty_child_element_request( template_url=self.get_empty_child_element.metadata["url"], @@ -1690,7 +1690,7 @@ def get_empty_child_element( @distributed_trace def put_empty_child_element( # pylint: disable=inconsistent-return-statements self, - banana, # type: "_models.Banana" + banana, # type: _models.Banana **kwargs # type: Any ): # type: (...) -> None @@ -1737,7 +1737,7 @@ def put_empty_child_element( # pylint: disable=inconsistent-return-statements def list_containers( self, **kwargs # type: Any ): - # type: (...) -> "_models.ListContainersResponse" + # type: (...) -> _models.ListContainersResponse """Lists containers in a storage account. :keyword comp: Default value is "list". Note that overriding this default value may result in @@ -1752,7 +1752,7 @@ def list_containers( error_map.update(kwargs.pop("error_map", {})) comp = kwargs.pop("comp", "list") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.ListContainersResponse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ListContainersResponse] request = build_list_containers_request( comp=comp, @@ -1783,7 +1783,7 @@ def list_containers( def get_service_properties( self, **kwargs # type: Any ): - # type: (...) -> "_models.StorageServiceProperties" + # type: (...) -> _models.StorageServiceProperties """Gets storage service properties. :keyword comp: Default value is "properties". Note that overriding this default value may @@ -1802,7 +1802,7 @@ def get_service_properties( comp = kwargs.pop("comp", "properties") # type: str restype = kwargs.pop("restype", "service") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.StorageServiceProperties"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.StorageServiceProperties] request = build_get_service_properties_request( comp=comp, @@ -1833,7 +1833,7 @@ def get_service_properties( @distributed_trace def put_service_properties( # pylint: disable=inconsistent-return-statements self, - properties, # type: "_models.StorageServiceProperties" + properties, # type: _models.StorageServiceProperties **kwargs # type: Any ): # type: (...) -> None @@ -1890,7 +1890,7 @@ def put_service_properties( # pylint: disable=inconsistent-return-statements def get_acls( self, **kwargs # type: Any ): - # type: (...) -> List["_models.SignedIdentifier"] + # type: (...) -> List[_models.SignedIdentifier] """Gets storage ACLs for a container. :keyword comp: Default value is "acl". Note that overriding this default value may result in @@ -1909,7 +1909,7 @@ def get_acls( comp = kwargs.pop("comp", "acl") # type: str restype = kwargs.pop("restype", "container") # type: str - cls = kwargs.pop("cls", None) # type: ClsType[List["_models.SignedIdentifier"]] + cls = kwargs.pop("cls", None) # type: ClsType[List[_models.SignedIdentifier]] request = build_get_acls_request( comp=comp, @@ -1940,7 +1940,7 @@ def get_acls( @distributed_trace def put_acls( # pylint: disable=inconsistent-return-statements self, - properties, # type: List["_models.SignedIdentifier"] + properties, # type: List[_models.SignedIdentifier] **kwargs # type: Any ): # type: (...) -> None @@ -2000,7 +2000,7 @@ def put_acls( # pylint: disable=inconsistent-return-statements def list_blobs( self, **kwargs # type: Any ): - # type: (...) -> "_models.ListBlobsResponse" + # type: (...) -> _models.ListBlobsResponse """Lists blobs in a storage container. :keyword comp: Default value is "list". Note that overriding this default value may result in @@ -2019,7 +2019,7 @@ def list_blobs( comp = kwargs.pop("comp", "list") # type: str restype = kwargs.pop("restype", "container") # type: str - cls = kwargs.pop("cls", None) # type: ClsType["_models.ListBlobsResponse"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ListBlobsResponse] request = build_list_blobs_request( comp=comp, @@ -2099,7 +2099,7 @@ def json_input( # pylint: disable=inconsistent-return-statements def json_output( self, **kwargs # type: Any ): - # type: (...) -> "_models.JSONOutput" + # type: (...) -> _models.JSONOutput """A Swagger with XML that has one operation that returns JSON. ID number 42. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2110,7 +2110,7 @@ def json_output( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.JSONOutput"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.JSONOutput] request = build_json_output_request( template_url=self.json_output.metadata["url"], @@ -2140,7 +2140,7 @@ def json_output( def get_xms_text( self, **kwargs # type: Any ): - # type: (...) -> "_models.ObjectWithXMsTextProperty" + # type: (...) -> _models.ObjectWithXMsTextProperty """Get back an XML object with an x-ms-text property, which should translate to the returned object's 'language' property being 'english' and its 'content' property being 'I am text'. @@ -2152,7 +2152,7 @@ def get_xms_text( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ObjectWithXMsTextProperty"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ObjectWithXMsTextProperty] request = build_get_xms_text_request( template_url=self.get_xms_text.metadata["url"], @@ -2182,7 +2182,7 @@ def get_xms_text( def get_bytes( self, **kwargs # type: Any ): - # type: (...) -> "_models.ModelWithByteProperty" + # type: (...) -> _models.ModelWithByteProperty """Get an XML document with binary property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2193,7 +2193,7 @@ def get_bytes( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ModelWithByteProperty"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ModelWithByteProperty] request = build_get_bytes_request( template_url=self.get_bytes.metadata["url"], @@ -2272,7 +2272,7 @@ def put_binary( # pylint: disable=inconsistent-return-statements def get_uri( self, **kwargs # type: Any ): - # type: (...) -> "_models.ModelWithUrlProperty" + # type: (...) -> _models.ModelWithUrlProperty """Get an XML document with uri property. :keyword callable cls: A custom type or function that will be passed the direct response @@ -2283,7 +2283,7 @@ def get_uri( error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError} error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.ModelWithUrlProperty"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ModelWithUrlProperty] request = build_get_uri_request( template_url=self.get_uri.metadata["url"], diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py index 0d2c333c291..9a09775eb78 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py @@ -52,7 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional["_models.Pet"]: + async def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional[_models.Pet]: """Gets pets by id. :param pet_id: pet id. @@ -73,7 +73,7 @@ async def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional["_models.P } error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Pet"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Pet]] request = build_get_pet_by_id_request( pet_id=pet_id, @@ -103,7 +103,7 @@ async def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional["_models.P get_pet_by_id.metadata = {"url": "/errorStatusCodes/Pets/{petId}/GetPet"} # type: ignore @distributed_trace_async - async def do_something(self, what_action: str, **kwargs: Any) -> "_models.PetAction": + async def do_something(self, what_action: str, **kwargs: Any) -> _models.PetAction: """Asks pet to do something. :param what_action: what action the pet should do. @@ -123,7 +123,7 @@ async def do_something(self, what_action: str, **kwargs: Any) -> "_models.PetAct } error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAction"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAction] request = build_do_something_request( what_action=what_action, diff --git a/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py b/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py index 865ab9f9f29..9e6858dc971 100644 --- a/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py +++ b/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py @@ -141,7 +141,7 @@ def get_pet_by_id( pet_id, # type: str **kwargs # type: Any ): - # type: (...) -> Optional["_models.Pet"] + # type: (...) -> Optional[_models.Pet] """Gets pets by id. :param pet_id: pet id. @@ -162,7 +162,7 @@ def get_pet_by_id( } error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType[Optional["_models.Pet"]] + cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.Pet]] request = build_get_pet_by_id_request( pet_id=pet_id, @@ -197,7 +197,7 @@ def do_something( what_action, # type: str **kwargs # type: Any ): - # type: (...) -> "_models.PetAction" + # type: (...) -> _models.PetAction """Asks pet to do something. :param what_action: what action the pet should do. @@ -217,7 +217,7 @@ def do_something( } error_map.update(kwargs.pop("error_map", {})) - cls = kwargs.pop("cls", None) # type: ClsType["_models.PetAction"] + cls = kwargs.pop("cls", None) # type: ClsType[_models.PetAction] request = build_do_something_request( what_action=what_action,