Skip to content

Commit 52981f9

Browse files
authored
improve type completeness (#33720)
* improve type completeness * update * update * updates * update * updates * updates * update * update * enable verifytypes
1 parent 9c5bfa1 commit 52981f9

32 files changed

+76
-68
lines changed

sdk/identity/azure-identity/azure/identity/_credentials/authorization_code.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ def __init__(
5050
self._redirect_uri = redirect_uri
5151
super(AuthorizationCodeCredential, self).__init__()
5252

53-
def __enter__(self):
53+
def __enter__(self) -> "AuthorizationCodeCredential":
5454
self._client.__enter__()
5555
return self
5656

57-
def __exit__(self, *args):
57+
def __exit__(self, *args: Any) -> None:
5858
self._client.__exit__(*args)
5959

6060
def close(self) -> None:

sdk/identity/azure-identity/azure/identity/_credentials/azure_cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ def __init__(
6060
self._additionally_allowed_tenants = additionally_allowed_tenants or []
6161
self._process_timeout = process_timeout
6262

63-
def __enter__(self):
63+
def __enter__(self) -> "AzureCliCredential":
6464
return self
6565

66-
def __exit__(self, *args):
66+
def __exit__(self, *args: Any) -> None:
6767
pass
6868

6969
def close(self) -> None:

sdk/identity/azure-identity/azure/identity/_credentials/azure_powershell.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ def __init__(
7474
self._additionally_allowed_tenants = additionally_allowed_tenants or []
7575
self._process_timeout = process_timeout
7676

77-
def __enter__(self):
77+
def __enter__(self) -> "AzurePowerShellCredential":
7878
return self
7979

80-
def __exit__(self, *args):
80+
def __exit__(self, *args: Any) -> None:
8181
pass
8282

8383
def close(self) -> None:

sdk/identity/azure-identity/azure/identity/_credentials/chained.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ def __init__(self, *credentials):
5656
self._successful_credential = None # type: Optional[TokenCredential]
5757
self.credentials = credentials
5858

59-
def __enter__(self):
59+
def __enter__(self) -> "ChainedTokenCredential":
6060
for credential in self.credentials:
6161
credential.__enter__() # type: ignore
6262
return self
6363

64-
def __exit__(self, *args: Any):
64+
def __exit__(self, *args: Any) -> None:
6565
for credential in self.credentials:
6666
credential.__exit__(*args) # type: ignore
6767

sdk/identity/azure-identity/azure/identity/_credentials/client_assertion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ def __init__(self, tenant_id: str, client_id: str, func: Callable[[], str], **kw
5555
)
5656
super(ClientAssertionCredential, self).__init__(**kwargs)
5757

58-
def __enter__(self):
58+
def __enter__(self) -> "ClientAssertionCredential":
5959
self._client.__enter__()
6060
return self
6161

62-
def __exit__(self, *args):
62+
def __exit__(self, *args: Any) -> None:
6363
self._client.__exit__(*args)
6464

6565
def close(self) -> None:

sdk/identity/azure-identity/azure/identity/_credentials/device_code.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class DeviceCodeCredential(InteractiveCredential):
3939
- ``verification_uri`` (str) the URL the user must visit
4040
- ``user_code`` (str) the code the user must enter there
4141
- ``expires_on`` (datetime.datetime) the UTC time at which the code will expire
42+
4243
If this argument isn't provided, the credential will print instructions to stdout.
4344
:paramtype prompt_callback: Callable[str, str, ~datetime.datetime]
4445
:keyword AuthenticationRecord authentication_record: :class:`AuthenticationRecord` returned by :func:`authenticate`

sdk/identity/azure-identity/azure/identity/_credentials/environment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ def __init__(self, **kwargs: Any) -> None:
108108
else:
109109
_LOGGER.info("No environment configuration found.")
110110

111-
def __enter__(self):
111+
def __enter__(self) -> "EnvironmentCredential":
112112
if self._credential:
113113
self._credential.__enter__()
114114
return self
115115

116-
def __exit__(self, *args):
116+
def __exit__(self, *args: Any) -> None:
117117
if self._credential:
118118
self._credential.__exit__(*args)
119119

sdk/identity/azure-identity/azure/identity/_credentials/imds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def __init__(self, **kwargs: Any) -> None:
6565
self._endpoint_available = None
6666
self._user_assigned_identity = "client_id" in kwargs or "identity_config" in kwargs
6767

68-
def __enter__(self):
68+
def __enter__(self) -> "ImdsCredential":
6969
self._client.__enter__()
7070
return self
7171

sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,14 @@ def __init__(self, **kwargs: Any) -> None:
9696
_LOGGER.info("%s will use IMDS", self.__class__.__name__)
9797
self._credential = ImdsCredential(**kwargs)
9898

99-
def __enter__(self):
100-
self._credential.__enter__()
99+
def __enter__(self) -> "ManagedIdentityCredential":
100+
if self._credential:
101+
self._credential.__enter__() # type: ignore
101102
return self
102103

103-
def __exit__(self, *args):
104-
self._credential.__exit__(*args)
104+
def __exit__(self, *args: Any) -> None:
105+
if self._credential:
106+
self._credential.__exit__(*args) # type: ignore
105107

106108
def close(self) -> None:
107109
"""Close the credential's transport session."""

sdk/identity/azure-identity/azure/identity/_credentials/shared_cache.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
from typing import TYPE_CHECKING, Any, Optional
5+
from typing import TYPE_CHECKING, Any, Optional, TypeVar
66
from azure.core.credentials import AccessToken
77

88
from .silent import SilentAuthenticationCredential
@@ -16,6 +16,9 @@
1616
from azure.core.credentials import TokenCredential
1717

1818

19+
T = TypeVar("T", bound="_SharedTokenCacheCredential")
20+
21+
1922
class SharedTokenCacheCredential:
2023
"""Authenticates using tokens in the local cache shared between Microsoft applications.
2124
@@ -40,12 +43,12 @@ def __init__(self, username: Optional[str] = None, **kwargs: Any) -> None:
4043
else:
4144
self._credential = _SharedTokenCacheCredential(username=username, **kwargs)
4245

43-
def __enter__(self):
44-
self._credential.__enter__()
46+
def __enter__(self) -> "SharedTokenCacheCredential":
47+
self._credential.__enter__() # type: ignore
4548
return self
4649

47-
def __exit__(self, *args):
48-
self._credential.__exit__(*args)
50+
def __exit__(self, *args: Any) -> None:
51+
self._credential.__exit__(*args) # type: ignore
4952

5053
def close(self) -> None:
5154
"""Close the credential's transport session."""
@@ -97,9 +100,9 @@ def supported() -> bool:
97100
class _SharedTokenCacheCredential(SharedTokenCacheBase):
98101
"""The original SharedTokenCacheCredential, which doesn't use msal.ClientApplication"""
99102

100-
def __enter__(self):
103+
def __enter__(self: T) -> T:
101104
if self._client:
102-
self._client.__enter__()
105+
self._client.__enter__() # type: ignore
103106
return self
104107

105108
def __exit__(self, *args):

0 commit comments

Comments
 (0)