From 3dd1f2f615f13dd4c5895db1f8b41b75127b5575 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Mon, 29 Apr 2024 09:31:48 -0700 Subject: [PATCH 1/5] Fixed pyright error for `MsalCredential` --- sdk/identity/azure-identity/CHANGELOG.md | 2 ++ .../azure/identity/_internal/msal_credentials.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md index 0a03c8d61622..debb3b1a31d1 100644 --- a/sdk/identity/azure-identity/CHANGELOG.md +++ b/sdk/identity/azure-identity/CHANGELOG.md @@ -8,6 +8,8 @@ ### Bugs Fixed +- Fixed pyright error for `MsalCredential` ([#35184](https://github.com/Azure/azure-sdk-for-python/pull/35184)) + ### Other Changes ## 1.16.0 (2024-04-09) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py index 308dd52df75d..b29d86539f93 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ import os -from typing import Any, List, Union, Dict, Optional +from typing import Any, List, Union, Dict, Optional, Self import msal @@ -59,7 +59,7 @@ def __init__( super(MsalCredential, self).__init__() - def __enter__(self) -> "MsalCredential": + def __enter__(self) -> "Self": self._client.__enter__() return self From cf49a29736b6bbf72164b8970bf9741587e20421 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Mon, 29 Apr 2024 10:14:26 -0700 Subject: [PATCH 2/5] update --- .../azure/identity/_internal/msal_credentials.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py index b29d86539f93..8384bb82cd51 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ import os -from typing import Any, List, Union, Dict, Optional, Self +from typing import Any, List, Union, Dict, Optional import msal @@ -59,7 +59,7 @@ def __init__( super(MsalCredential, self).__init__() - def __enter__(self) -> "Self": + def __enter__(self): self._client.__enter__() return self From 9a9702da1b5efa976622688c660344f2de577aa6 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Mon, 29 Apr 2024 14:55:53 -0700 Subject: [PATCH 3/5] updates --- .../azure/identity/_internal/msal_credentials.py | 3 ++- sdk/identity/azure-identity/setup.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py index 8384bb82cd51..c135aedfa062 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py @@ -4,6 +4,7 @@ # ------------------------------------ import os from typing import Any, List, Union, Dict, Optional +from typing_extensions import Self import msal @@ -59,7 +60,7 @@ def __init__( super(MsalCredential, self).__init__() - def __enter__(self): + def __enter__(self) -> "Self": self._client.__enter__() return self diff --git a/sdk/identity/azure-identity/setup.py b/sdk/identity/azure-identity/setup.py index 3228dff23497..7d72d16583db 100644 --- a/sdk/identity/azure-identity/setup.py +++ b/sdk/identity/azure-identity/setup.py @@ -63,5 +63,6 @@ "cryptography>=2.5", "msal>=1.24.0", "msal-extensions>=0.3.0", + "typing-extensions>=4.0.0", ], ) From d3572e419f18caa611c6c550902ad342365a40cf Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 30 Apr 2024 14:23:51 -0700 Subject: [PATCH 4/5] Update sdk/identity/azure-identity/CHANGELOG.md Co-authored-by: Paul Van Eck --- sdk/identity/azure-identity/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md index debb3b1a31d1..21aa7be04807 100644 --- a/sdk/identity/azure-identity/CHANGELOG.md +++ b/sdk/identity/azure-identity/CHANGELOG.md @@ -8,7 +8,7 @@ ### Bugs Fixed -- Fixed pyright error for `MsalCredential` ([#35184](https://github.com/Azure/azure-sdk-for-python/pull/35184)) +- Fixed typing errors when certain credentials are used as context managers. ([#35415](https://github.com/Azure/azure-sdk-for-python/pull/35415)) ### Other Changes From 2113afac4b79b4993471290fc7fb6e7e50d0a9e0 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 30 Apr 2024 14:23:56 -0700 Subject: [PATCH 5/5] Update sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py Co-authored-by: Paul Van Eck --- .../azure-identity/azure/identity/_internal/msal_credentials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py index c135aedfa062..a44d7e6012fc 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py @@ -60,7 +60,7 @@ def __init__( super(MsalCredential, self).__init__() - def __enter__(self) -> "Self": + def __enter__(self) -> Self: self._client.__enter__() return self