diff --git a/autorest/codegen/serializers/general_serializer.py b/autorest/codegen/serializers/general_serializer.py index eb0e3032659..3edac2257a9 100644 --- a/autorest/codegen/serializers/general_serializer.py +++ b/autorest/codegen/serializers/general_serializer.py @@ -78,9 +78,6 @@ def serialize_vendor_file(self) -> str: ) if self.code_model.need_mixin_abc: - file_import.add_submodule_import( - "__future__", "annotations", ImportType.STDLIB - ) file_import.add_submodule_import( "abc", "ABC", diff --git a/autorest/codegen/templates/vendor.py.jinja2 b/autorest/codegen/templates/vendor.py.jinja2 index 604e5bde7d1..eebf6e929e0 100644 --- a/autorest/codegen/templates/vendor.py.jinja2 +++ b/autorest/codegen/templates/vendor.py.jinja2 @@ -29,8 +29,8 @@ def _format_url_section(template, **kwargs): class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: {{ keywords.async_class }}PipelineClient + _client: "{{ keywords.async_class }}PipelineClient" _config: {{ code_model.class_name }}Configuration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" {% endif %} \ No newline at end of file diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 8003fecf0f8..883ac5c82bf 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -40,11 +40,14 @@ jobs: strategy: matrix: + Windows_Python36: + OSName: "Windows" + OSVmImage: "MMS2019" + PythonVersion: "3.6" Linux_Python37: OSName: "Linux" OSVmImage: "MMSUbuntu20.04" PythonVersion: "3.7" - CoverageArg: "" Linux_Python310: OSName: "Linux" OSVmImage: "MMSUbuntu20.04" diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_vendor.py b/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_vendor.py index 1743cb911d6..b5f5a6049cc 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_vendor.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: AutoRestReportServiceForAzureConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_vendor.py b/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_vendor.py index 1bcd5388376..e00cf1e635e 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_vendor.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: AutoRestReportServiceForAzureConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_vendor.py b/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_vendor.py index 02b233ea0a6..2ccf7fc0f15 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_vendor.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs): class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: LROWithParamaterizedEndpointsConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_vendor.py b/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_vendor.py index fea64020d74..8500c8343cd 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_vendor.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: LROWithParamaterizedEndpointsConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_vendor.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_vendor.py index 157f49beff7..d0777645751 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_vendor.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs): class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: DPGClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_vendor.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_vendor.py index 4b3fb862218..6aa266154e2 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_vendor.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: DPGClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_vendor.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_vendor.py index 157f49beff7..d0777645751 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_vendor.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs): class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: DPGClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_vendor.py b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_vendor.py index 4b3fb862218..6aa266154e2 100644 --- a/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_vendor.py +++ b/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: DPGClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_vendor.py index d6e036e675d..228fef48640 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: AnythingClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_vendor.py index a5819f5beea..9867c456c45 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: AnythingClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_vendor.py index cfabd440031..40d7c33b486 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: ErrorWithSecretsConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_vendor.py index 0daa33ca12b..1b18654a31b 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: ErrorWithSecretsConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_vendor.py index 7f739e2cd5d..5ee00a510ce 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: IncorrectReturnedErrorModelConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_vendor.py index db0ba2317d8..76aaa49fd48 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: IncorrectReturnedErrorModelConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_vendor.py index 8aa751efb3d..c270a39836f 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: MediaTypesClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_vendor.py index 3ac44a138ef..7293735b4d9 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: MediaTypesClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_vendor.py index 7d3cec05fcf..4bc34b6f7ae 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: MergePatchJsonClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_vendor.py index 5b607ddc1c8..36ea68b9300 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: MergePatchJsonClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_vendor.py index 9dc3ff9ec5c..a95ef3877f6 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs): class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: AutoRestResourceFlatteningTestServiceConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_vendor.py index 90654bd8678..794624a55a1 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: AutoRestResourceFlatteningTestServiceConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_vendor.py index 7f3ba39838e..f3c2061b79c 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: MultipleInheritanceServiceClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_vendor.py index 96a748cb1a7..424ac76d885 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: MultipleInheritanceServiceClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_vendor.py index f90869c28d9..3c7792b7fd9 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: ObjectTypeClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_vendor.py index 8eb531e73ac..a22daa0398d 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: ObjectTypeClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_vendor.py index 056c5cd56b4..3b15446f799 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: ParmaterizedEndpointClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_vendor.py index 5ed30da6e9a..f1dd1ff7368 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: ParmaterizedEndpointClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_vendor.py index 8b0d287332e..e4d1ea5ae0b 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: AutoRestReportServiceConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_vendor.py index 6316dda82c7..b63d107c06d 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: AutoRestReportServiceConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_vendor.py index 30cc78404ec..1e1fe3f65ee 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs): class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: ReservedWordsClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/_vendor.py index 89c0902605b..bf40aad9517 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: ReservedWordsClientConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_vendor.py index be8478d20d1..142d7b34393 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -32,7 +31,7 @@ def _format_url_section(template, **kwargs): class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: PipelineClient + _client: "PipelineClient" _config: AutoRestValidationTestConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer" diff --git a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_vendor.py b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_vendor.py index ef4db392d8e..071bade20ad 100644 --- a/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_vendor.py +++ b/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_vendor.py @@ -5,7 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from __future__ import annotations from abc import ABC from typing import TYPE_CHECKING @@ -21,7 +20,7 @@ class MixinABC(ABC): """DO NOT use this class. It is for internal typing use only.""" - _client: AsyncPipelineClient + _client: "AsyncPipelineClient" _config: AutoRestValidationTestConfiguration - _serialize: Serializer - _deserialize: Deserializer + _serialize: "Serializer" + _deserialize: "Deserializer"