Skip to content

Commit 2302cef

Browse files
authored
{Misc} Remove Python 3.8 typing fallbacks (#30473)
1 parent dd424b8 commit 2302cef

File tree

8 files changed

+13
-49
lines changed

8 files changed

+13
-49
lines changed

src/azure-cli/azure/cli/command_modules/containerapp/_sdk_models.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# pylint: disable=redefined-builtin
1111
# pylint: disable=too-many-instance-attributes, useless-parent-delegation, anomalous-backslash-in-string
1212

13+
from collections.abc import MutableMapping
1314
import datetime
14-
import sys
15-
from typing import Any, Dict, List, Optional, Union
15+
from typing import Any, Dict, List, Literal, Optional, Union
1616

1717
import msrest.serialization as _serialization
1818

@@ -41,16 +41,7 @@
4141
StorageType
4242
)
4343

44-
if sys.version_info >= (3, 9):
45-
from collections.abc import MutableMapping
46-
else:
47-
from typing import MutableMapping # type: ignore # pylint: disable=ungrouped-imports
48-
if sys.version_info >= (3, 8):
49-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
50-
else:
51-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
52-
53-
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
44+
JSON = MutableMapping[str, Any]
5445

5546

5647
class AllowedAudiencesValidation(_serialization.Model):

src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_internal/async_challenge_auth_policy.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
protocol again.
1515
"""
1616

17+
from collections.abc import Awaitable
1718
from copy import deepcopy
1819
import sys
1920
import time
@@ -32,11 +33,6 @@
3233
from . import http_challenge_cache as ChallengeCache
3334
from .challenge_auth_policy import _enforce_tls, _has_claims, _update_challenge
3435

35-
if sys.version_info < (3, 9):
36-
from typing import Awaitable
37-
else:
38-
from collections.abc import Awaitable
39-
4036

4137
P = ParamSpec("P")
4238
T = TypeVar("T")

src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_model_base.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# --------------------------------------------------------------------------
88
# pylint: disable=protected-access, arguments-differ, signature-differs, broad-except, too-many-lines
99

10+
from collections.abc import MutableMapping
1011
import copy
1112
import calendar
1213
import decimal
@@ -28,11 +29,6 @@
2829
from azure.core.pipeline import PipelineResponse
2930
from azure.core.serialization import _Null
3031

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

3834
__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]

src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_operations/_operations.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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

1313
from azure.core.exceptions import (
@@ -32,10 +32,6 @@
3232
from .._serialization import Serializer
3333
from .._vendor import KeyVaultClientMixinABC
3434

35-
if sys.version_info >= (3, 9):
36-
from collections.abc import MutableMapping
37-
else:
38-
from typing import MutableMapping # type: ignore
3935
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
4036
T = TypeVar("T")
4137
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]

src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/aio/_operations/_operations.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
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
1011
import sys
@@ -38,11 +39,7 @@
3839
)
3940
from .._vendor import KeyVaultClientMixinABC
4041

41-
if sys.version_info >= (3, 9):
42-
from collections.abc import MutableMapping
43-
else:
44-
from typing import MutableMapping # type: ignore
45-
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
42+
JSON = MutableMapping[str, Any]
4643
T = TypeVar("T")
4744
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
4845

src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/aio/_patch.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
88
"""
9-
import sys
9+
from collections.abc import Awaitable
1010
from typing import Any, IO, List, Literal, MutableMapping, Optional, overload, Union
1111

1212
from azure.core.credentials_async import AsyncTokenCredential
@@ -28,11 +28,6 @@
2828
from ..models import CertificateInfoObject, SecurityDomainObject, SecurityDomainOperationStatus
2929
from .._patch import DEFAULT_VERSION, _format_api_version, _SERIALIZER
3030

31-
if sys.version_info < (3, 9):
32-
from typing import Awaitable
33-
else:
34-
from collections.abc import Awaitable
35-
3631
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
3732

3833
__all__: List[str] = [

src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/aio/operations/_operations.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
1212

1313
from azure.core.exceptions import (
@@ -37,11 +37,7 @@
3737
build_hsm_security_domain_upload_request,
3838
)
3939

40-
if sys.version_info >= (3, 9):
41-
from collections.abc import MutableMapping
42-
else:
43-
from typing import MutableMapping # type: ignore
44-
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
40+
JSON = MutableMapping[str, Any]
4541
T = TypeVar("T")
4642
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
4743

src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/operations/_operations.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
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
1011
import sys
@@ -31,11 +32,7 @@
3132
from .._model_base import SdkJSONEncoder, _deserialize
3233
from .._serialization import Serializer
3334

34-
if sys.version_info >= (3, 9):
35-
from collections.abc import MutableMapping
36-
else:
37-
from typing import MutableMapping # type: ignore
38-
JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object
35+
JSON = MutableMapping[str, Any]
3936
T = TypeVar("T")
4037
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
4138

0 commit comments

Comments
 (0)