Skip to content

Commit 35823ca

Browse files
mccoypmccoyp
committed
Generate with latest emitter
1 parent 99ef197 commit 35823ca

21 files changed

Lines changed: 110 additions & 145 deletions

File tree

‎sdk/keyvault/azure-keyvault-securitydomain/MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ include azure/keyvault/securitydomain/py.typed
44
recursive-include tests *.py
55
recursive-include samples *.py *.md
66
include azure/__init__.py
7-
include azure/keyvault/__init__.py
7+
include azure/keyvault/__init__.py

‎sdk/keyvault/azure-keyvault-securitydomain/apiview-properties.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22
"CrossLanguagePackageId": "KeyVault",
33
"CrossLanguageDefinitionId": {
44
"azure.keyvault.securitydomain.models.CertificateInfo": "KeyVault.CertificateInfoObject",
5+
"azure.keyvault.securitydomain.models.Error": "Error",
56
"azure.keyvault.securitydomain.models.KeyVaultError": "KeyVaultError",
6-
"azure.keyvault.securitydomain.models.KeyVaultErrorError": "KeyVaultError.error.anonymous",
77
"azure.keyvault.securitydomain.models.SecurityDomain": "KeyVault.SecurityDomainObject",
88
"azure.keyvault.securitydomain.models.SecurityDomainJsonWebKey": "KeyVault.SecurityDomainJsonWebKey",
99
"azure.keyvault.securitydomain.models.SecurityDomainOperationStatus": "KeyVault.SecurityDomainOperationStatus",
1010
"azure.keyvault.securitydomain.models.TransferKey": "KeyVault.TransferKey",
1111
"azure.keyvault.securitydomain.models.OperationStatus": "KeyVault.OperationStatus",
1212
"azure.keyvault.securitydomain.SecurityDomainClient.get_download_status": "ClientCustomizations.SecurityDomainClient.getDownloadStatus",
13+
"azure.keyvault.securitydomain.aio.SecurityDomainClient.get_download_status": "ClientCustomizations.SecurityDomainClient.getDownloadStatus",
1314
"azure.keyvault.securitydomain.SecurityDomainClient.get_upload_status": "ClientCustomizations.SecurityDomainClient.getUploadStatus",
14-
"azure.keyvault.securitydomain.SecurityDomainClient.get_transfer_key": "ClientCustomizations.SecurityDomainClient.getTransferKey"
15+
"azure.keyvault.securitydomain.aio.SecurityDomainClient.get_upload_status": "ClientCustomizations.SecurityDomainClient.getUploadStatus",
16+
"azure.keyvault.securitydomain.SecurityDomainClient.get_transfer_key": "ClientCustomizations.SecurityDomainClient.getTransferKey",
17+
"azure.keyvault.securitydomain.aio.SecurityDomainClient.get_transfer_key": "ClientCustomizations.SecurityDomainClient.getTransferKey"
1518
}
1619
}

‎sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_client.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from ._configuration import SecurityDomainClientConfiguration
1818
from ._operations import SecurityDomainClientOperationsMixin
19-
from ._serialization import Deserializer, Serializer
19+
from ._utils.serialization import Deserializer, Serializer
2020

2121
if TYPE_CHECKING:
2222
from azure.core.credentials import TokenCredential
@@ -37,6 +37,7 @@ class SecurityDomainClient(SecurityDomainClientOperationsMixin):
3737
def __init__(self, vault_base_url: str, credential: "TokenCredential", **kwargs: Any) -> None:
3838
_endpoint = "{vaultBaseUrl}"
3939
self._config = SecurityDomainClientConfiguration(vault_base_url=vault_base_url, credential=credential, **kwargs)
40+
4041
_policies = kwargs.pop("policies", None)
4142
if _policies is None:
4243
_policies = [

‎sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/async_polling.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from .polling import _finished, _is_empty, SecurityDomainDownloadPolling
1515
from ..models import SecurityDomain, SecurityDomainOperationStatus
16-
from .._model_base import _deserialize
16+
from .._utils.model_base import _deserialize
1717

1818

1919
PollingReturnType_co = TypeVar("PollingReturnType_co", covariant=True)

‎sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/polling.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from azure.core.rest import AsyncHttpResponse, HttpResponse, HttpRequest
1212

1313
from ..models import SecurityDomain, SecurityDomainOperationStatus
14-
from .._model_base import _deserialize
14+
from .._utils.model_base import _deserialize
1515

1616

1717
PollingReturnType_co = TypeVar("PollingReturnType_co", covariant=True)

‎sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_operations/_operations.py‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
# Code generated by Microsoft (R) Python Code Generator.
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
8+
from collections.abc import MutableMapping
89
from io import IOBase
910
import json
10-
import sys
1111
from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload
1212

13+
from azure.core import PipelineClient
1314
from azure.core.exceptions import (
1415
ClientAuthenticationError,
1516
HttpResponseError,
@@ -28,15 +29,12 @@
2829
from azure.core.utils import case_insensitive_dict
2930

3031
from .. import models as _models
31-
from .._model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
32-
from .._serialization import Serializer
33-
from .._vendor import SecurityDomainClientMixinABC
34-
35-
if sys.version_info >= (3, 9):
36-
from collections.abc import MutableMapping
37-
else:
38-
from typing import MutableMapping # type: ignore
39-
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
32+
from .._configuration import SecurityDomainClientConfiguration
33+
from .._utils.model_base import SdkJSONEncoder, _deserialize, _failsafe_deserialize
34+
from .._utils.serialization import Serializer
35+
from .._utils.utils import ClientMixinABC
36+
37+
JSON = MutableMapping[str, Any]
4038
T = TypeVar("T")
4139
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
4240

@@ -145,7 +143,7 @@ def build_security_domain_get_transfer_key_request(**kwargs: Any) -> HttpRequest
145143
return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
146144

147145

148-
class SecurityDomainClientOperationsMixin(SecurityDomainClientMixinABC):
146+
class SecurityDomainClientOperationsMixin(ClientMixinABC[PipelineClient, SecurityDomainClientConfiguration]):
149147

150148
@distributed_trace
151149
def get_download_status(self, **kwargs: Any) -> _models.SecurityDomainOperationStatus:

‎sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_operations/_patch.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# ------------------------------------
2-
# Copyright (c) Microsoft Corporation.
3-
# Licensed under the MIT License.
4-
# ------------------------------------
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for license information.
5+
# --------------------------------------------------------------------------
56
"""Customize generated code here.
67
78
Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize

‎sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_patch.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# ------------------------------------
2-
# Copyright (c) Microsoft Corporation.
3-
# Licensed under the MIT License.
4-
# ------------------------------------
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for license information.
5+
# --------------------------------------------------------------------------
56
"""Customize generated code here.
67
78
Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
@@ -28,7 +29,7 @@
2829
SecurityDomainUploadPollingMethod,
2930
)
3031
from .models import CertificateInfo, SecurityDomain
31-
from ._serialization import Serializer
32+
from ._utils.serialization import Serializer
3233

3334
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
3435

‎sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_utils/__init__.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) Python Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------

sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_model_base.py renamed to sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_utils/model_base.py

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# coding=utf-8
33
# --------------------------------------------------------------------------
44
# Copyright (c) Microsoft Corporation. All rights reserved.
5-
# Licensed under the MIT License. See License.txt in the project root for
6-
# license information.
5+
# Licensed under the MIT License. See License.txt in the project root for license information.
6+
# Code generated by Microsoft (R) Python Code Generator.
7+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
78
# --------------------------------------------------------------------------
8-
# pylint: disable=protected-access, broad-except, arguments-differ, signature-differs, no-member
9+
# pylint: disable=protected-access, broad-except
910

1011
import copy
1112
import calendar
@@ -21,18 +22,14 @@
2122
from datetime import datetime, date, time, timedelta, timezone
2223
from json import JSONEncoder
2324
import xml.etree.ElementTree as ET
25+
from collections.abc import MutableMapping
2426
from typing_extensions import Self
2527
import isodate
2628
from azure.core.exceptions import DeserializationError
2729
from azure.core import CaseInsensitiveEnumMeta
2830
from azure.core.pipeline import PipelineResponse
2931
from azure.core.serialization import _Null
3032

31-
if sys.version_info >= (3, 9):
32-
from collections.abc import MutableMapping
33-
else:
34-
from typing import MutableMapping
35-
3633
_LOGGER = logging.getLogger(__name__)
3734

3835
__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
@@ -347,7 +344,7 @@ def _get_model(module_name: str, model_name: str):
347344
_UNSET = object()
348345

349346

350-
class _MyMutableMapping(MutableMapping[str, typing.Any]): # pylint: disable=unsubscriptable-object
347+
class _MyMutableMapping(MutableMapping[str, typing.Any]):
351348
def __init__(self, data: typing.Dict[str, typing.Any]) -> None:
352349
self._data = data
353350

@@ -407,13 +404,13 @@ def get(self, key: str, default: typing.Any = None) -> typing.Any:
407404
return default
408405

409406
@typing.overload
410-
def pop(self, key: str) -> typing.Any: ...
407+
def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ
411408

412409
@typing.overload
413-
def pop(self, key: str, default: _T) -> _T: ...
410+
def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs
414411

415412
@typing.overload
416-
def pop(self, key: str, default: typing.Any) -> typing.Any: ...
413+
def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs
417414

418415
def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any:
419416
"""
@@ -443,7 +440,7 @@ def clear(self) -> None:
443440
"""
444441
self._data.clear()
445442

446-
def update(self, *args: typing.Any, **kwargs: typing.Any) -> None:
443+
def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ
447444
"""
448445
Updates D from mapping/iterable E and F.
449446
:param any args: Either a mapping object or an iterable of key-value pairs.
@@ -454,7 +451,7 @@ def update(self, *args: typing.Any, **kwargs: typing.Any) -> None:
454451
def setdefault(self, key: str, default: None = None) -> None: ...
455452

456453
@typing.overload
457-
def setdefault(self, key: str, default: typing.Any) -> typing.Any: ...
454+
def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs
458455

459456
def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any:
460457
"""
@@ -644,7 +641,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self:
644641
cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items())
645642
cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}")
646643

647-
return super().__new__(cls) # pylint: disable=no-value-for-parameter
644+
return super().__new__(cls)
648645

649646
def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None:
650647
for base in cls.__bases__:
@@ -680,7 +677,7 @@ def _deserialize(cls, data, exist_discriminators):
680677
discriminator_value = data.find(xml_name).text # pyright: ignore
681678
else:
682679
discriminator_value = data.get(discriminator._rest_name)
683-
mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore
680+
mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member
684681
return mapped_cls._deserialize(data, exist_discriminators)
685682

686683
def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]:

0 commit comments

Comments
 (0)