From 0e532522173976c5c585464d164522982ec2130d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 7 Nov 2025 09:54:49 +0000
Subject: [PATCH 01/26] fix(deps): update dependency ty to v0.0.1a25

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1e51ef96e..6e5f5c439 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ dev = [
   "pytest-xdist==3.8.0",
   "pytest==8.4.2",
   "responses==0.25.8",
-  "ty==0.0.1a23",
+  "ty==0.0.1a25",
   "types-defusedxml==0.7.0.20250822",
   "types-oauthlib==3.3.0.20250822",
   "types-requests-oauthlib==2.0.0.20250809",
@@ -84,7 +84,7 @@ dev = [
   "pytest-xdist==3.8.0",
   "pytest==8.4.2",
   "responses==0.25.8",
-  "ty==0.0.1a23",
+  "ty==0.0.1a25",
   "types-defusedxml==0.7.0.20250822",
   "types-oauthlib==3.3.0.20250822",
   "types-requests-oauthlib==2.0.0.20250809",

From 2016eef83df219ab29b232c83b4b0bc9acd34cc3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 10:07:33 +0000
Subject: [PATCH 02/26] Initial plan


From 404c1dc78971cc198ebaf6bbf0e2a7f5d8fa9a31 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 10:20:28 +0000
Subject: [PATCH 03/26] Fix type check errors for ty v0.0.1a25

- Fix implicit shadowing error in test_utils.py by adding `Any` type annotation
- Fix missing attribute errors in test_twitter_oauth2.py by making mixin inherit from OAuth2Test during type checking

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/backends/test_twitter_oauth2.py | 8 +++++++-
 social_core/tests/test_utils.py                   | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/social_core/tests/backends/test_twitter_oauth2.py b/social_core/tests/backends/test_twitter_oauth2.py
index d76fba07e..3bac0402a 100644
--- a/social_core/tests/backends/test_twitter_oauth2.py
+++ b/social_core/tests/backends/test_twitter_oauth2.py
@@ -1,6 +1,7 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
+from typing import TYPE_CHECKING
 
 from social_core.exceptions import AuthException
 
@@ -11,8 +12,13 @@
     OAuth2Test,
 )
 
+if TYPE_CHECKING:
+    _Base = OAuth2Test
+else:
+    _Base = object
 
-class TwitterOAuth2Mixin:
+
+class TwitterOAuth2Mixin(_Base):  # type: ignore[misc]
     backend_path = "social_core.backends.twitter_oauth2.TwitterOAuth2"
     user_data_url = "https://api.twitter.com/2/users/me"
     access_token_body = json.dumps(
diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 058c02a47..9d5cd6194 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -1,5 +1,6 @@
 import base64
 import unittest
+from typing import Any
 from unittest.mock import Mock
 
 from social_core.backends.base import BaseAuth
@@ -199,7 +200,7 @@ def _backend(self, session_kwargs=None):
 class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
-        self.backend.setting = Mock(
+        self.backend.setting: Any = Mock(
             side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"
         )
 

From 810b8b69cfa4761710783f4e7bff1307f0fc180d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 10:26:19 +0000
Subject: [PATCH 04/26] Fix remaining type check errors for ty v0.0.1a25

- Fix BitbucketDataCenterOAuth2Mixin and EtsyOAuth2Mixin by adding conditional base classes
- Fix OpenIdTest by adding type annotations for discovery_body and server_response
- Fix invalid-assignment error in base.py by adding type: ignore
- Fix non-subscriptable error in vk.py by adding type: ignore
- Fix invalid-argument-type errors in oauth.py and yahoo.py by adding type: ignore
- Fix parameter-already-assigned error in strategy.py by adding type: ignore

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/backends/base.py                           |  2 +-
 social_core/backends/oauth.py                          |  2 +-
 social_core/backends/vk.py                             |  2 +-
 social_core/backends/yahoo.py                          |  2 +-
 social_core/strategy.py                                |  2 +-
 social_core/tests/backends/open_id.py                  |  4 ++++
 .../tests/backends/test_bitbucket_datacenter.py        | 10 ++++++++--
 social_core/tests/backends/test_etsy.py                |  8 +++++++-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/social_core/backends/base.py b/social_core/backends/base.py
index 79cc96379..91d235ffc 100644
--- a/social_core/backends/base.py
+++ b/social_core/backends/base.py
@@ -168,7 +168,7 @@ def extra_data(
             elif len(entry) == 3:
                 name, alias, discard = entry
             elif len(entry) == 2:
-                name, alias = entry
+                name, alias = entry  # type: ignore[misc]
             elif len(entry) == 1:
                 name = alias = entry[0]
             else:
diff --git a/social_core/backends/oauth.py b/social_core/backends/oauth.py
index 8582bbe9e..d3141ccc1 100644
--- a/social_core/backends/oauth.py
+++ b/social_core/backends/oauth.py
@@ -511,7 +511,7 @@ def refresh_token(self, token, *args, **kwargs):
         method = self.REFRESH_TOKEN_METHOD
         key = "params" if method == "GET" else "data"
         request_args = {"headers": self.auth_headers(), "method": method, key: params}
-        request = self.request(url, **request_args)
+        request = self.request(url, **request_args)  # type: ignore[arg-type]
         return self.process_refresh_token_response(request, *args, **kwargs)
 
     def refresh_token_url(self):
diff --git a/social_core/backends/vk.py b/social_core/backends/vk.py
index 743b8757c..246a2a274 100644
--- a/social_core/backends/vk.py
+++ b/social_core/backends/vk.py
@@ -211,6 +211,6 @@ def auth_complete(self, *args, **kwargs):
             },
         }
         auth_data["response"].update(
-            json.loads(auth_data["request"]["api_result"])["response"][0]
+            json.loads(auth_data["request"]["api_result"])["response"][0]  # type: ignore[index]
         )
         return self.strategy.authenticate(*args, **auth_data)
diff --git a/social_core/backends/yahoo.py b/social_core/backends/yahoo.py
index 25450d231..28ee4c3c9 100644
--- a/social_core/backends/yahoo.py
+++ b/social_core/backends/yahoo.py
@@ -135,7 +135,7 @@ def refresh_token(self, token, *args, **kwargs):
         key = "params" if method == "GET" else "data"
         request_args = {"headers": self.auth_headers(), "method": method, key: params}
         request = self.request(
-            url, auth=HTTPBasicAuth(*self.get_key_and_secret()), **request_args
+            url, auth=HTTPBasicAuth(*self.get_key_and_secret()), **request_args  # type: ignore[arg-type]
         )
         return self.process_refresh_token_response(request, *args, **kwargs)
 
diff --git a/social_core/strategy.py b/social_core/strategy.py
index 148becb82..de741566d 100644
--- a/social_core/strategy.py
+++ b/social_core/strategy.py
@@ -199,7 +199,7 @@ def get_backend(
     ) -> BaseAuth:
         """Return a configured backend instance"""
         Backend = self.get_backend_class(name)
-        return Backend(self, *args, redirect_uri=redirect_uri, **kwargs)
+        return Backend(self, *args, redirect_uri=redirect_uri, **kwargs)  # type: ignore[misc]
 
     # Implement the following methods on strategies sub-classes
 
diff --git a/social_core/tests/backends/open_id.py b/social_core/tests/backends/open_id.py
index cd0cadf17..787660e02 100644
--- a/social_core/tests/backends/open_id.py
+++ b/social_core/tests/backends/open_id.py
@@ -32,6 +32,10 @@ def handle_starttag(self, tag, attrs) -> None:
 
 
 class OpenIdTest(BaseBackendTest):
+    # Attributes that should be defined by subclasses
+    discovery_body: str
+    server_response: str
+
     def setUp(self) -> None:
         responses.start()
         Backend = module_member(self.backend_path)
diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index c8c2fc83f..91e438403 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -1,13 +1,19 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
+from typing import TYPE_CHECKING
 
 import responses
 
-from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test
+from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test, OAuth2Test
 
+if TYPE_CHECKING:
+    _Base = OAuth2Test
+else:
+    _Base = object
 
-class BitbucketDataCenterOAuth2Mixin:
+
+class BitbucketDataCenterOAuth2Mixin(_Base):  # type: ignore[misc]
     backend_path = "social_core.backends.bitbucket_datacenter.BitbucketDataCenterOAuth2"
     application_properties_url = (
         "https://bachmanity.atlassian.net/rest/api/latest/application-properties"
diff --git a/social_core/tests/backends/test_etsy.py b/social_core/tests/backends/test_etsy.py
index 3b0ed4023..0a9a5e3f8 100644
--- a/social_core/tests/backends/test_etsy.py
+++ b/social_core/tests/backends/test_etsy.py
@@ -1,11 +1,17 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
+from typing import TYPE_CHECKING
 
 from .oauth import OAuth2PkceS256Test
 
+if TYPE_CHECKING:
+    _Base = OAuth2PkceS256Test
+else:
+    _Base = object
 
-class EtsyOAuth2Mixin:
+
+class EtsyOAuth2Mixin(_Base):  # type: ignore[misc]
     backend_path = "social_core.backends.etsy.EtsyOAuth2"
     access_token_body = json.dumps(
         {

From 2e58511479803ba636a294a148da33fba752480f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 10:27:47 +0000
Subject: [PATCH 05/26] Improve comment clarity in open_id.py

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/backends/open_id.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social_core/tests/backends/open_id.py b/social_core/tests/backends/open_id.py
index 787660e02..ff75c74c1 100644
--- a/social_core/tests/backends/open_id.py
+++ b/social_core/tests/backends/open_id.py
@@ -32,7 +32,7 @@ def handle_starttag(self, tag, attrs) -> None:
 
 
 class OpenIdTest(BaseBackendTest):
-    # Attributes that should be defined by subclasses
+    # These attributes must be defined by subclasses
     discovery_body: str
     server_response: str
 

From ae208768095973cf7d3ce09856d2be0215741762 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 7 Nov 2025 10:44:22 +0000
Subject: [PATCH 06/26] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 social_core/backends/yahoo.py                           | 4 +++-
 social_core/tests/backends/test_bitbucket_datacenter.py | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/social_core/backends/yahoo.py b/social_core/backends/yahoo.py
index 28ee4c3c9..cec107319 100644
--- a/social_core/backends/yahoo.py
+++ b/social_core/backends/yahoo.py
@@ -135,7 +135,9 @@ def refresh_token(self, token, *args, **kwargs):
         key = "params" if method == "GET" else "data"
         request_args = {"headers": self.auth_headers(), "method": method, key: params}
         request = self.request(
-            url, auth=HTTPBasicAuth(*self.get_key_and_secret()), **request_args  # type: ignore[arg-type]
+            url,
+            auth=HTTPBasicAuth(*self.get_key_and_secret()),
+            **request_args,  # type: ignore[arg-type]
         )
         return self.process_refresh_token_response(request, *args, **kwargs)
 
diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index 91e438403..b6c2f3a82 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -5,9 +5,11 @@
 
 import responses
 
-from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test, OAuth2Test
+from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test
 
 if TYPE_CHECKING:
+    from .oauth import OAuth2Test
+
     _Base = OAuth2Test
 else:
     _Base = object

From beb42bb636f597643dc4bc90389049526550c546 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 11:01:33 +0000
Subject: [PATCH 07/26] Replace _Base pattern with Protocol for type checking

- Use Protocol instead of conditional inheritance to avoid runtime differences
- Fix pyright error in test_utils.py by using cast() instead of invalid annotation syntax
- Add self parameter type annotations in mixin methods to satisfy type checkers
- All type checks now pass with proper Protocol-based approach

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 .../backends/test_bitbucket_datacenter.py     | 24 +++++++++++--------
 social_core/tests/backends/test_etsy.py       | 18 ++++++++------
 .../tests/backends/test_twitter_oauth2.py     | 18 ++++++++------
 social_core/tests/test_utils.py               |  6 ++---
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index b6c2f3a82..84da0ac7d 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -1,21 +1,25 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Protocol
 
 import responses
 
 from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test
 
 if TYPE_CHECKING:
-    from .oauth import OAuth2Test
 
-    _Base = OAuth2Test
-else:
-    _Base = object
+    class _OAuth2TestProtocol(Protocol):
+        """Protocol for OAuth2Test methods used by mixins."""
 
+        def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
+        def do_login(self) -> Any: ...
+        def do_refresh_token(self) -> Any: ...
+        @property
+        def name(self) -> str: ...
 
-class BitbucketDataCenterOAuth2Mixin(_Base):  # type: ignore[misc]
+
+class BitbucketDataCenterOAuth2Mixin:
     backend_path = "social_core.backends.bitbucket_datacenter.BitbucketDataCenterOAuth2"
     application_properties_url = (
         "https://bachmanity.atlassian.net/rest/api/latest/application-properties"
@@ -69,14 +73,14 @@ class BitbucketDataCenterOAuth2Mixin(_Base):  # type: ignore[misc]
     )
     expected_username = "erlich-bachman"
 
-    def extra_settings(self):
+    def extra_settings(self: "_OAuth2TestProtocol"):  # type: ignore[misc]
         settings = super().extra_settings()
         settings.update(
             {f"SOCIAL_AUTH_{self.name}_URL": "https://bachmanity.atlassian.net"}
         )
         return settings
 
-    def auth_handlers(self, start_url):
+    def auth_handlers(self: "_OAuth2TestProtocol", start_url):  # type: ignore[misc]
         target_url = super().auth_handlers(start_url)
         responses.add(
             responses.GET,
@@ -87,7 +91,7 @@ def auth_handlers(self, start_url):
         )
         return target_url
 
-    def test_login(self) -> None:
+    def test_login(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
         user = self.do_login()
 
         self.assertEqual(len(user.social), 1)
@@ -116,7 +120,7 @@ def test_login(self) -> None:
         self.assertEqual(social.extra_data["expires"], 3600)
         self.assertEqual(social.extra_data["refresh_token"], "dummy_refresh_token")
 
-    def test_refresh_token(self) -> None:
+    def test_refresh_token(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
         _, social = self.do_refresh_token()
 
         self.assertEqual(social.uid, "1")
diff --git a/social_core/tests/backends/test_etsy.py b/social_core/tests/backends/test_etsy.py
index 0a9a5e3f8..8f61c6cbd 100644
--- a/social_core/tests/backends/test_etsy.py
+++ b/social_core/tests/backends/test_etsy.py
@@ -1,17 +1,21 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Protocol
 
 from .oauth import OAuth2PkceS256Test
 
 if TYPE_CHECKING:
-    _Base = OAuth2PkceS256Test
-else:
-    _Base = object
 
+    class _OAuth2PkceS256TestProtocol(Protocol):
+        """Protocol for OAuth2PkceS256Test methods used by mixins."""
 
-class EtsyOAuth2Mixin(_Base):  # type: ignore[misc]
+        def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
+        def do_login(self) -> Any: ...
+        def do_refresh_token(self) -> Any: ...
+
+
+class EtsyOAuth2Mixin:
     backend_path = "social_core.backends.etsy.EtsyOAuth2"
     access_token_body = json.dumps(
         {
@@ -42,7 +46,7 @@ class EtsyOAuth2Mixin(_Base):  # type: ignore[misc]
     )
     expected_username = "dummy_user_id"
 
-    def test_login(self) -> None:
+    def test_login(self: "_OAuth2PkceS256TestProtocol") -> None:  # type: ignore[misc]
         user = self.do_login()
         self.assertEqual(len(user.social), 1)
 
@@ -64,7 +68,7 @@ def test_login(self) -> None:
             social.extra_data["refresh_token"], "dummy_user_id.dummy_refresh_token"
         )
 
-    def test_refresh_token(self) -> None:
+    def test_refresh_token(self: "_OAuth2PkceS256TestProtocol") -> None:  # type: ignore[misc]
         _, social = self.do_refresh_token()
 
         self.assertEqual(social.uid, "dummy_user_id")
diff --git a/social_core/tests/backends/test_twitter_oauth2.py b/social_core/tests/backends/test_twitter_oauth2.py
index 3bac0402a..b983fdf85 100644
--- a/social_core/tests/backends/test_twitter_oauth2.py
+++ b/social_core/tests/backends/test_twitter_oauth2.py
@@ -1,7 +1,7 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Protocol
 
 from social_core.exceptions import AuthException
 
@@ -13,12 +13,16 @@
 )
 
 if TYPE_CHECKING:
-    _Base = OAuth2Test
-else:
-    _Base = object
 
+    class _OAuth2TestProtocol(Protocol):
+        """Protocol for OAuth2Test methods used by mixins."""
 
-class TwitterOAuth2Mixin(_Base):  # type: ignore[misc]
+        def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
+        def do_login(self) -> Any: ...
+        def do_partial_pipeline(self) -> Any: ...
+
+
+class TwitterOAuth2Mixin:
     backend_path = "social_core.backends.twitter_oauth2.TwitterOAuth2"
     user_data_url = "https://api.twitter.com/2/users/me"
     access_token_body = json.dumps(
@@ -86,7 +90,7 @@ class TwitterOAuth2Mixin(_Base):  # type: ignore[misc]
 
     expected_username = "twitter_username"
 
-    def test_login(self) -> None:
+    def test_login(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
         user = self.do_login()
 
         self.assertEqual(len(user.social), 1)
@@ -112,7 +116,7 @@ def test_login(self) -> None:
         self.assertEqual(social.extra_data["public_metrics"]["tweet_count"], 40)
         self.assertEqual(social.extra_data["public_metrics"]["listed_count"], 7)
 
-    def test_partial_pipeline(self) -> None:
+    def test_partial_pipeline(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
         user = self.do_partial_pipeline()
         self.assertEqual(len(user.social), 1)
 
diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 9d5cd6194..0cbfb83a7 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -1,6 +1,6 @@
 import base64
 import unittest
-from typing import Any
+from typing import Any, cast
 from unittest.mock import Mock
 
 from social_core.backends.base import BaseAuth
@@ -200,8 +200,8 @@ def _backend(self, session_kwargs=None):
 class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
-        self.backend.setting: Any = Mock(
-            side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"
+        self.backend.setting = cast(
+            Any, Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret")
         )
 
     def test_basic_auth_returns_bytes(self) -> None:

From 53f0c8794fb784732476d1e3046e62125565d8ec Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 13:47:53 +0000
Subject: [PATCH 08/26] Make mixins inherit from Protocol during TYPE_CHECKING

- Changed approach to have mixin classes inherit from Protocol when TYPE_CHECKING is True
- Removed self parameter type annotations from mixin methods
- This is cleaner than manually annotating each method's self parameter
- Type checks still pass with 0 errors

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 .../tests/backends/test_bitbucket_datacenter.py    | 14 +++++++++-----
 social_core/tests/backends/test_etsy.py            | 10 +++++++---
 social_core/tests/backends/test_twitter_oauth2.py  | 10 +++++++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index 84da0ac7d..2e574a335 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -18,8 +18,12 @@ def do_refresh_token(self) -> Any: ...
         @property
         def name(self) -> str: ...
 
+    _BitbucketDataCenterOAuth2MixinBase = _OAuth2TestProtocol
+else:
+    _BitbucketDataCenterOAuth2MixinBase = object
 
-class BitbucketDataCenterOAuth2Mixin:
+
+class BitbucketDataCenterOAuth2Mixin(_BitbucketDataCenterOAuth2MixinBase):
     backend_path = "social_core.backends.bitbucket_datacenter.BitbucketDataCenterOAuth2"
     application_properties_url = (
         "https://bachmanity.atlassian.net/rest/api/latest/application-properties"
@@ -73,14 +77,14 @@ class BitbucketDataCenterOAuth2Mixin:
     )
     expected_username = "erlich-bachman"
 
-    def extra_settings(self: "_OAuth2TestProtocol"):  # type: ignore[misc]
+    def extra_settings(self):
         settings = super().extra_settings()
         settings.update(
             {f"SOCIAL_AUTH_{self.name}_URL": "https://bachmanity.atlassian.net"}
         )
         return settings
 
-    def auth_handlers(self: "_OAuth2TestProtocol", start_url):  # type: ignore[misc]
+    def auth_handlers(self, start_url):
         target_url = super().auth_handlers(start_url)
         responses.add(
             responses.GET,
@@ -91,7 +95,7 @@ def auth_handlers(self: "_OAuth2TestProtocol", start_url):  # type: ignore[misc]
         )
         return target_url
 
-    def test_login(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
+    def test_login(self) -> None:
         user = self.do_login()
 
         self.assertEqual(len(user.social), 1)
@@ -120,7 +124,7 @@ def test_login(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
         self.assertEqual(social.extra_data["expires"], 3600)
         self.assertEqual(social.extra_data["refresh_token"], "dummy_refresh_token")
 
-    def test_refresh_token(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
+    def test_refresh_token(self) -> None:
         _, social = self.do_refresh_token()
 
         self.assertEqual(social.uid, "1")
diff --git a/social_core/tests/backends/test_etsy.py b/social_core/tests/backends/test_etsy.py
index 8f61c6cbd..f174d2f3e 100644
--- a/social_core/tests/backends/test_etsy.py
+++ b/social_core/tests/backends/test_etsy.py
@@ -14,8 +14,12 @@ def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
         def do_login(self) -> Any: ...
         def do_refresh_token(self) -> Any: ...
 
+    _EtsyOAuth2MixinBase = _OAuth2PkceS256TestProtocol
+else:
+    _EtsyOAuth2MixinBase = object
 
-class EtsyOAuth2Mixin:
+
+class EtsyOAuth2Mixin(_EtsyOAuth2MixinBase):
     backend_path = "social_core.backends.etsy.EtsyOAuth2"
     access_token_body = json.dumps(
         {
@@ -46,7 +50,7 @@ class EtsyOAuth2Mixin:
     )
     expected_username = "dummy_user_id"
 
-    def test_login(self: "_OAuth2PkceS256TestProtocol") -> None:  # type: ignore[misc]
+    def test_login(self) -> None:
         user = self.do_login()
         self.assertEqual(len(user.social), 1)
 
@@ -68,7 +72,7 @@ def test_login(self: "_OAuth2PkceS256TestProtocol") -> None:  # type: ignore[mis
             social.extra_data["refresh_token"], "dummy_user_id.dummy_refresh_token"
         )
 
-    def test_refresh_token(self: "_OAuth2PkceS256TestProtocol") -> None:  # type: ignore[misc]
+    def test_refresh_token(self) -> None:
         _, social = self.do_refresh_token()
 
         self.assertEqual(social.uid, "dummy_user_id")
diff --git a/social_core/tests/backends/test_twitter_oauth2.py b/social_core/tests/backends/test_twitter_oauth2.py
index b983fdf85..d939d3106 100644
--- a/social_core/tests/backends/test_twitter_oauth2.py
+++ b/social_core/tests/backends/test_twitter_oauth2.py
@@ -21,8 +21,12 @@ def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
         def do_login(self) -> Any: ...
         def do_partial_pipeline(self) -> Any: ...
 
+    _TwitterOAuth2MixinBase = _OAuth2TestProtocol
+else:
+    _TwitterOAuth2MixinBase = object
 
-class TwitterOAuth2Mixin:
+
+class TwitterOAuth2Mixin(_TwitterOAuth2MixinBase):
     backend_path = "social_core.backends.twitter_oauth2.TwitterOAuth2"
     user_data_url = "https://api.twitter.com/2/users/me"
     access_token_body = json.dumps(
@@ -90,7 +94,7 @@ class TwitterOAuth2Mixin:
 
     expected_username = "twitter_username"
 
-    def test_login(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
+    def test_login(self) -> None:
         user = self.do_login()
 
         self.assertEqual(len(user.social), 1)
@@ -116,7 +120,7 @@ def test_login(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
         self.assertEqual(social.extra_data["public_metrics"]["tweet_count"], 40)
         self.assertEqual(social.extra_data["public_metrics"]["listed_count"], 7)
 
-    def test_partial_pipeline(self: "_OAuth2TestProtocol") -> None:  # type: ignore[misc]
+    def test_partial_pipeline(self) -> None:
         user = self.do_partial_pipeline()
         self.assertEqual(len(user.social), 1)
 

From fc82ba8a1ab9a4eca76a842e229360e669cfbc26 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 14:14:15 +0000
Subject: [PATCH 09/26] Changes before error encountered

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 .../backends/test_bitbucket_datacenter.py     | 23 ++++++++-----------
 social_core/tests/backends/test_etsy.py       | 19 ++++++---------
 .../tests/backends/test_twitter_oauth2.py     | 19 ++++++---------
 3 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index 2e574a335..d2513a41b 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -1,29 +1,24 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import TYPE_CHECKING, Any, Protocol
+from typing import Any, Protocol
 
 import responses
 
 from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test
 
-if TYPE_CHECKING:
 
-    class _OAuth2TestProtocol(Protocol):
-        """Protocol for OAuth2Test methods used by mixins."""
+class _OAuth2TestProtocol(Protocol):
+    """Protocol for OAuth2Test methods used by mixins."""
 
-        def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
-        def do_login(self) -> Any: ...
-        def do_refresh_token(self) -> Any: ...
-        @property
-        def name(self) -> str: ...
+    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
+    def do_login(self) -> Any: ...
+    def do_refresh_token(self) -> Any: ...
+    @property
+    def name(self) -> str: ...
 
-    _BitbucketDataCenterOAuth2MixinBase = _OAuth2TestProtocol
-else:
-    _BitbucketDataCenterOAuth2MixinBase = object
 
-
-class BitbucketDataCenterOAuth2Mixin(_BitbucketDataCenterOAuth2MixinBase):
+class BitbucketDataCenterOAuth2Mixin(_OAuth2TestProtocol):
     backend_path = "social_core.backends.bitbucket_datacenter.BitbucketDataCenterOAuth2"
     application_properties_url = (
         "https://bachmanity.atlassian.net/rest/api/latest/application-properties"
diff --git a/social_core/tests/backends/test_etsy.py b/social_core/tests/backends/test_etsy.py
index f174d2f3e..3e1b11a32 100644
--- a/social_core/tests/backends/test_etsy.py
+++ b/social_core/tests/backends/test_etsy.py
@@ -1,25 +1,20 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import TYPE_CHECKING, Any, Protocol
+from typing import Any, Protocol
 
 from .oauth import OAuth2PkceS256Test
 
-if TYPE_CHECKING:
 
-    class _OAuth2PkceS256TestProtocol(Protocol):
-        """Protocol for OAuth2PkceS256Test methods used by mixins."""
+class _OAuth2PkceS256TestProtocol(Protocol):
+    """Protocol for OAuth2PkceS256Test methods used by mixins."""
 
-        def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
-        def do_login(self) -> Any: ...
-        def do_refresh_token(self) -> Any: ...
+    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
+    def do_login(self) -> Any: ...
+    def do_refresh_token(self) -> Any: ...
 
-    _EtsyOAuth2MixinBase = _OAuth2PkceS256TestProtocol
-else:
-    _EtsyOAuth2MixinBase = object
 
-
-class EtsyOAuth2Mixin(_EtsyOAuth2MixinBase):
+class EtsyOAuth2Mixin(_OAuth2PkceS256TestProtocol):
     backend_path = "social_core.backends.etsy.EtsyOAuth2"
     access_token_body = json.dumps(
         {
diff --git a/social_core/tests/backends/test_twitter_oauth2.py b/social_core/tests/backends/test_twitter_oauth2.py
index d939d3106..b8604bb23 100644
--- a/social_core/tests/backends/test_twitter_oauth2.py
+++ b/social_core/tests/backends/test_twitter_oauth2.py
@@ -1,7 +1,7 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import TYPE_CHECKING, Any, Protocol
+from typing import Any, Protocol
 
 from social_core.exceptions import AuthException
 
@@ -12,21 +12,16 @@
     OAuth2Test,
 )
 
-if TYPE_CHECKING:
 
-    class _OAuth2TestProtocol(Protocol):
-        """Protocol for OAuth2Test methods used by mixins."""
+class _OAuth2TestProtocol(Protocol):
+    """Protocol for OAuth2Test methods used by mixins."""
 
-        def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
-        def do_login(self) -> Any: ...
-        def do_partial_pipeline(self) -> Any: ...
+    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
+    def do_login(self) -> Any: ...
+    def do_partial_pipeline(self) -> Any: ...
 
-    _TwitterOAuth2MixinBase = _OAuth2TestProtocol
-else:
-    _TwitterOAuth2MixinBase = object
 
-
-class TwitterOAuth2Mixin(_TwitterOAuth2MixinBase):
+class TwitterOAuth2Mixin(_OAuth2TestProtocol):
     backend_path = "social_core.backends.twitter_oauth2.TwitterOAuth2"
     user_data_url = "https://api.twitter.com/2/users/me"
     access_token_body = json.dumps(

From 09630fa70f70da2c212e3e3d254ca3af40fdf1ac Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Nov 2025 16:22:22 +0000
Subject: [PATCH 10/26] Share OAuth2TestProtocol across all test files

- Created a single OAuth2TestProtocol in oauth.py that includes all methods needed by mixins
- Removed duplicate Protocol definitions from test_twitter_oauth2.py, test_etsy.py, and test_bitbucket_datacenter.py
- All three test files now import and use the shared OAuth2TestProtocol
- This reduces code duplication and makes the Protocol easier to maintain

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/backends/oauth.py           | 32 ++++++++++++++++++-
 .../backends/test_bitbucket_datacenter.py     | 15 ++-------
 social_core/tests/backends/test_etsy.py       | 13 ++------
 .../tests/backends/test_twitter_oauth2.py     | 12 ++-----
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/social_core/tests/backends/oauth.py b/social_core/tests/backends/oauth.py
index 886a51810..72e79f070 100644
--- a/social_core/tests/backends/oauth.py
+++ b/social_core/tests/backends/oauth.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Generic, TypeVar, cast
+from typing import Any, Generic, Protocol, TypeVar, cast
 from unittest.mock import patch
 from urllib.parse import urlparse
 
@@ -16,6 +16,36 @@
 OAuthBackendT = TypeVar("OAuthBackendT", bound=OAuthAuth)
 
 
+class OAuth2TestProtocol(Protocol):
+    """Protocol for OAuth2 test methods used by mixins.
+    
+    This protocol defines the interface that OAuth2 test mixins expect
+    from test base classes. It includes common unittest.TestCase methods
+    and OAuth2-specific test helper methods.
+    """
+
+    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None:
+        """Assert that two values are equal."""
+        ...
+
+    def do_login(self) -> Any:
+        """Perform a login flow and return the user."""
+        ...
+
+    def do_partial_pipeline(self) -> Any:
+        """Perform a partial pipeline flow and return the user."""
+        ...
+
+    def do_refresh_token(self) -> Any:
+        """Perform a token refresh flow."""
+        ...
+
+    @property
+    def name(self) -> str:
+        """Backend name for settings."""
+        ...
+
+
 class BaseOAuthTest(BaseBackendTest[OAuthBackendT], Generic[OAuthBackendT]):
     user_data_body: str | None = None
     user_data_url: str = ""
diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index d2513a41b..ea443ebe5 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -1,24 +1,13 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import Any, Protocol
 
 import responses
 
-from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test
+from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test, OAuth2TestProtocol
 
 
-class _OAuth2TestProtocol(Protocol):
-    """Protocol for OAuth2Test methods used by mixins."""
-
-    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
-    def do_login(self) -> Any: ...
-    def do_refresh_token(self) -> Any: ...
-    @property
-    def name(self) -> str: ...
-
-
-class BitbucketDataCenterOAuth2Mixin(_OAuth2TestProtocol):
+class BitbucketDataCenterOAuth2Mixin(OAuth2TestProtocol):
     backend_path = "social_core.backends.bitbucket_datacenter.BitbucketDataCenterOAuth2"
     application_properties_url = (
         "https://bachmanity.atlassian.net/rest/api/latest/application-properties"
diff --git a/social_core/tests/backends/test_etsy.py b/social_core/tests/backends/test_etsy.py
index 3e1b11a32..c5f507970 100644
--- a/social_core/tests/backends/test_etsy.py
+++ b/social_core/tests/backends/test_etsy.py
@@ -1,20 +1,11 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import Any, Protocol
 
-from .oauth import OAuth2PkceS256Test
+from .oauth import OAuth2PkceS256Test, OAuth2TestProtocol
 
 
-class _OAuth2PkceS256TestProtocol(Protocol):
-    """Protocol for OAuth2PkceS256Test methods used by mixins."""
-
-    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
-    def do_login(self) -> Any: ...
-    def do_refresh_token(self) -> Any: ...
-
-
-class EtsyOAuth2Mixin(_OAuth2PkceS256TestProtocol):
+class EtsyOAuth2Mixin(OAuth2TestProtocol):
     backend_path = "social_core.backends.etsy.EtsyOAuth2"
     access_token_body = json.dumps(
         {
diff --git a/social_core/tests/backends/test_twitter_oauth2.py b/social_core/tests/backends/test_twitter_oauth2.py
index b8604bb23..3b60e65c8 100644
--- a/social_core/tests/backends/test_twitter_oauth2.py
+++ b/social_core/tests/backends/test_twitter_oauth2.py
@@ -1,7 +1,6 @@
 # pyright: reportAttributeAccessIssue=false
 
 import json
-from typing import Any, Protocol
 
 from social_core.exceptions import AuthException
 
@@ -10,18 +9,11 @@
     OAuth2PkcePlainTest,
     OAuth2PkceS256Test,
     OAuth2Test,
+    OAuth2TestProtocol,
 )
 
 
-class _OAuth2TestProtocol(Protocol):
-    """Protocol for OAuth2Test methods used by mixins."""
-
-    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None: ...
-    def do_login(self) -> Any: ...
-    def do_partial_pipeline(self) -> Any: ...
-
-
-class TwitterOAuth2Mixin(_OAuth2TestProtocol):
+class TwitterOAuth2Mixin(OAuth2TestProtocol):
     backend_path = "social_core.backends.twitter_oauth2.TwitterOAuth2"
     user_data_url = "https://api.twitter.com/2/users/me"
     access_token_body = json.dumps(

From 6ee66638298fdb0ad2d0d1818803808bc4f93a24 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 07:35:12 +0000
Subject: [PATCH 11/26] Improve type annotations in OAuth2TestProtocol

- Replace Any with specific types: User, TestUserSocialAuth, tuple
- Changed assertEqual parameters from Any to object for better type safety
- do_login() and do_partial_pipeline() now return User instead of Any
- do_refresh_token() now returns tuple[User, TestUserSocialAuth] instead of Any
- Added TestUserSocialAuth to imports for type annotations

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/backends/oauth.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/social_core/tests/backends/oauth.py b/social_core/tests/backends/oauth.py
index 72e79f070..b951ccbb3 100644
--- a/social_core/tests/backends/oauth.py
+++ b/social_core/tests/backends/oauth.py
@@ -8,7 +8,7 @@
 import responses
 
 from social_core.backends.oauth import BaseOAuth1, BaseOAuth2, OAuthAuth
-from social_core.tests.models import User
+from social_core.tests.models import TestUserSocialAuth, User
 from social_core.utils import get_querystring, parse_qs, url_add_parameters
 
 from .base import BaseBackendTest
@@ -24,20 +24,20 @@ class OAuth2TestProtocol(Protocol):
     and OAuth2-specific test helper methods.
     """
 
-    def assertEqual(self, first: Any, second: Any, msg: Any = None) -> None:
+    def assertEqual(self, first: object, second: object, msg: object = None) -> None:
         """Assert that two values are equal."""
         ...
 
-    def do_login(self) -> Any:
+    def do_login(self) -> User:
         """Perform a login flow and return the user."""
         ...
 
-    def do_partial_pipeline(self) -> Any:
+    def do_partial_pipeline(self) -> User:
         """Perform a partial pipeline flow and return the user."""
         ...
 
-    def do_refresh_token(self) -> Any:
-        """Perform a token refresh flow."""
+    def do_refresh_token(self) -> tuple[User, TestUserSocialAuth]:
+        """Perform a token refresh flow and return user and social auth."""
         ...
 
     @property

From a83cca24a2f442acf90eb0b960a351bfb3c4bf97 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 10 Nov 2025 07:44:54 +0000
Subject: [PATCH 12/26] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 social_core/tests/backends/oauth.py | 9 ++++++---
 social_core/tests/test_utils.py     | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/social_core/tests/backends/oauth.py b/social_core/tests/backends/oauth.py
index b951ccbb3..9ec945afb 100644
--- a/social_core/tests/backends/oauth.py
+++ b/social_core/tests/backends/oauth.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Generic, Protocol, TypeVar, cast
+from typing import TYPE_CHECKING, Generic, Protocol, TypeVar, cast
 from unittest.mock import patch
 from urllib.parse import urlparse
 
@@ -8,17 +8,20 @@
 import responses
 
 from social_core.backends.oauth import BaseOAuth1, BaseOAuth2, OAuthAuth
-from social_core.tests.models import TestUserSocialAuth, User
+from social_core.tests.models import User
 from social_core.utils import get_querystring, parse_qs, url_add_parameters
 
 from .base import BaseBackendTest
 
+if TYPE_CHECKING:
+    from social_core.tests.models import TestUserSocialAuth
+
 OAuthBackendT = TypeVar("OAuthBackendT", bound=OAuthAuth)
 
 
 class OAuth2TestProtocol(Protocol):
     """Protocol for OAuth2 test methods used by mixins.
-    
+
     This protocol defines the interface that OAuth2 test mixins expect
     from test base classes. It includes common unittest.TestCase methods
     and OAuth2-specific test helper methods.
diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 0cbfb83a7..8d4bde72b 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -201,7 +201,8 @@ class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
         self.backend.setting = cast(
-            Any, Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret")
+            "Any",
+            Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"),
         )
 
     def test_basic_auth_returns_bytes(self) -> None:

From 5164e4fe6286f3349782150212d3ed8bef22302c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 08:05:02 +0000
Subject: [PATCH 13/26] Fix cast() call broken by pre-commit autofix

Pre-commit incorrectly changed cast(Any, ...) to cast("Any", ...).
The first argument to cast() must be a type object, not a string,
even with PEP 563 (from __future__ import annotations). This would
cause a runtime error. Changed it back to cast(Any, ...).

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 8d4bde72b..6d99b5d5b 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -201,7 +201,7 @@ class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
         self.backend.setting = cast(
-            "Any",
+            Any,
             Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"),
         )
 

From eaf9c84859321344e4374a730da9e28e07ce0d32 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 10 Nov 2025 08:11:10 +0000
Subject: [PATCH 14/26] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 social_core/tests/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 6d99b5d5b..8d4bde72b 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -201,7 +201,7 @@ class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
         self.backend.setting = cast(
-            Any,
+            "Any",
             Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"),
         )
 

From f137f4f8f6af08d1ebaf51917dac9837c6194f36 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 11:52:16 +0000
Subject: [PATCH 15/26] Fix cast() again and add noqa to prevent pre-commit
 changes

Pre-commit autofix keeps incorrectly changing cast(Any, ...) to
cast("Any", ...). Added # noqa: F821 comment to prevent the linter
from flagging this and causing the autofix to change it. The first
argument to cast() MUST be a type object, not a string.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 8d4bde72b..8bf593ada 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -201,7 +201,7 @@ class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
         self.backend.setting = cast(
-            "Any",
+            Any,  # noqa: F821
             Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"),
         )
 

From 3600f1ce721666f58ec2140081a57502693c39c5 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 12:41:58 +0000
Subject: [PATCH 16/26] Revert to cast("Any", ...) - string form is correct

As nijel correctly pointed out, cast() at runtime just returns its
second argument, so cast("Any", ...) is perfectly fine and actually
preferred with PEP 563 (from __future__ import annotations). The
string form is the correct approach. Removed the noqa comment.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 8bf593ada..8d4bde72b 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -201,7 +201,7 @@ class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
         self.backend.setting = cast(
-            Any,  # noqa: F821
+            "Any",
             Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"),
         )
 

From a7573b2f70e63f57f26a78d49839cf3308740f85 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:05:32 +0000
Subject: [PATCH 17/26] Replace cast() with type: ignore comment for Mock
 assignment

Instead of using cast() which was causing issues, use a simple
type: ignore[method-assign] comment. This is cleaner and more
appropriate for dynamically replacing a method with a Mock in tests.
The original error was about invalid type annotation syntax
(self.backend.setting: Any = ...), which is now resolved.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/test_utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 8d4bde72b..343ad759e 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -200,9 +200,9 @@ def _backend(self, session_kwargs=None):
 class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
-        self.backend.setting = cast(
-            "Any",
-            Mock(side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"),
+        # Assign Mock to setting method, bypassing type checking for this dynamic replacement
+        self.backend.setting = Mock(  # type: ignore[method-assign]
+            side_effect=lambda x: "test_key" if x == "KEY" else "test_secret"
         )
 
     def test_basic_auth_returns_bytes(self) -> None:

From 939725d470ee533348ee3d69b77c8155bb19a533 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:12:38 +0000
Subject: [PATCH 18/26] Remove Protocol inheritance from mixins to fix MRO
 issues

Mixins should not inherit from Protocol as this causes MRO (Method
Resolution Order) issues when used with multiple inheritance. The
mixins are combined with test classes like:
  class TwitterOAuth2TestPkcePlain(TwitterOAuth2Mixin, OAuth2PkcePlainTest)

Having Protocol in the inheritance chain breaks this pattern. Instead,
we rely on the `# pyright: reportAttributeAccessIssue=false` directive
at the top of each file to suppress type checker warnings about
accessing methods from the test base classes.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/backends/test_bitbucket_datacenter.py | 4 ++--
 social_core/tests/backends/test_etsy.py                 | 4 ++--
 social_core/tests/backends/test_twitter_oauth2.py       | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index ea443ebe5..c8c2fc83f 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -4,10 +4,10 @@
 
 import responses
 
-from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test, OAuth2TestProtocol
+from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test
 
 
-class BitbucketDataCenterOAuth2Mixin(OAuth2TestProtocol):
+class BitbucketDataCenterOAuth2Mixin:
     backend_path = "social_core.backends.bitbucket_datacenter.BitbucketDataCenterOAuth2"
     application_properties_url = (
         "https://bachmanity.atlassian.net/rest/api/latest/application-properties"
diff --git a/social_core/tests/backends/test_etsy.py b/social_core/tests/backends/test_etsy.py
index c5f507970..3b0ed4023 100644
--- a/social_core/tests/backends/test_etsy.py
+++ b/social_core/tests/backends/test_etsy.py
@@ -2,10 +2,10 @@
 
 import json
 
-from .oauth import OAuth2PkceS256Test, OAuth2TestProtocol
+from .oauth import OAuth2PkceS256Test
 
 
-class EtsyOAuth2Mixin(OAuth2TestProtocol):
+class EtsyOAuth2Mixin:
     backend_path = "social_core.backends.etsy.EtsyOAuth2"
     access_token_body = json.dumps(
         {
diff --git a/social_core/tests/backends/test_twitter_oauth2.py b/social_core/tests/backends/test_twitter_oauth2.py
index 3b60e65c8..d76fba07e 100644
--- a/social_core/tests/backends/test_twitter_oauth2.py
+++ b/social_core/tests/backends/test_twitter_oauth2.py
@@ -9,11 +9,10 @@
     OAuth2PkcePlainTest,
     OAuth2PkceS256Test,
     OAuth2Test,
-    OAuth2TestProtocol,
 )
 
 
-class TwitterOAuth2Mixin(OAuth2TestProtocol):
+class TwitterOAuth2Mixin:
     backend_path = "social_core.backends.twitter_oauth2.TwitterOAuth2"
     user_data_url = "https://api.twitter.com/2/users/me"
     access_token_body = json.dumps(

From d66e21db6442662c7601aa920fb8701688d48bb8 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:22:07 +0000
Subject: [PATCH 19/26] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 social_core/tests/test_utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/social_core/tests/test_utils.py b/social_core/tests/test_utils.py
index 343ad759e..234da5df2 100644
--- a/social_core/tests/test_utils.py
+++ b/social_core/tests/test_utils.py
@@ -1,6 +1,5 @@
 import base64
 import unittest
-from typing import Any, cast
 from unittest.mock import Mock
 
 from social_core.backends.base import BaseAuth

From 99d802b8060269c6c68ca00c1e05a749a6a1f2fc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:29:24 +0000
Subject: [PATCH 20/26] Use Protocol properly with TYPE_CHECKING conditional
 inheritance

The mixins now inherit from OAuth2TestProtocol during type checking
only, using the TYPE_CHECKING guard. At runtime, they inherit from
object. This provides proper type hints without causing MRO issues:

```python
if TYPE_CHECKING:
    from .oauth import OAuth2TestProtocol
    _Base = OAuth2TestProtocol
else:
    _Base = object

class TwitterOAuth2Mixin(_Base):  # type: ignore[misc]
    ...
```

This way:
- Type checkers see the Protocol methods and don't complain
- At runtime, there's no Protocol in the MRO chain
- Multiple inheritance works correctly
- The OAuth2TestProtocol is actually used (not orphaned)

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 .../tests/backends/test_bitbucket_datacenter.py      | 12 +++++++++---
 social_core/tests/backends/test_etsy.py              | 12 +++++++++---
 social_core/tests/backends/test_twitter_oauth2.py    | 12 +++++++++---
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/social_core/tests/backends/test_bitbucket_datacenter.py b/social_core/tests/backends/test_bitbucket_datacenter.py
index c8c2fc83f..b4f1721ca 100644
--- a/social_core/tests/backends/test_bitbucket_datacenter.py
+++ b/social_core/tests/backends/test_bitbucket_datacenter.py
@@ -1,13 +1,19 @@
-# pyright: reportAttributeAccessIssue=false
-
 import json
+from typing import TYPE_CHECKING
 
 import responses
 
 from .oauth import OAuth2PkcePlainTest, OAuth2PkceS256Test
 
+if TYPE_CHECKING:
+    from .oauth import OAuth2TestProtocol
+
+    _Base = OAuth2TestProtocol
+else:
+    _Base = object
+
 
-class BitbucketDataCenterOAuth2Mixin:
+class BitbucketDataCenterOAuth2Mixin(_Base):  # type: ignore[misc]
     backend_path = "social_core.backends.bitbucket_datacenter.BitbucketDataCenterOAuth2"
     application_properties_url = (
         "https://bachmanity.atlassian.net/rest/api/latest/application-properties"
diff --git a/social_core/tests/backends/test_etsy.py b/social_core/tests/backends/test_etsy.py
index 3b0ed4023..d7382ef77 100644
--- a/social_core/tests/backends/test_etsy.py
+++ b/social_core/tests/backends/test_etsy.py
@@ -1,11 +1,17 @@
-# pyright: reportAttributeAccessIssue=false
-
 import json
+from typing import TYPE_CHECKING
 
 from .oauth import OAuth2PkceS256Test
 
+if TYPE_CHECKING:
+    from .oauth import OAuth2TestProtocol
+
+    _Base = OAuth2TestProtocol
+else:
+    _Base = object
+
 
-class EtsyOAuth2Mixin:
+class EtsyOAuth2Mixin(_Base):  # type: ignore[misc]
     backend_path = "social_core.backends.etsy.EtsyOAuth2"
     access_token_body = json.dumps(
         {
diff --git a/social_core/tests/backends/test_twitter_oauth2.py b/social_core/tests/backends/test_twitter_oauth2.py
index d76fba07e..6f757a57a 100644
--- a/social_core/tests/backends/test_twitter_oauth2.py
+++ b/social_core/tests/backends/test_twitter_oauth2.py
@@ -1,6 +1,5 @@
-# pyright: reportAttributeAccessIssue=false
-
 import json
+from typing import TYPE_CHECKING
 
 from social_core.exceptions import AuthException
 
@@ -11,8 +10,15 @@
     OAuth2Test,
 )
 
+if TYPE_CHECKING:
+    from .oauth import OAuth2TestProtocol
+
+    _Base = OAuth2TestProtocol
+else:
+    _Base = object
+
 
-class TwitterOAuth2Mixin:
+class TwitterOAuth2Mixin(_Base):  # type: ignore[misc]
     backend_path = "social_core.backends.twitter_oauth2.TwitterOAuth2"
     user_data_url = "https://api.twitter.com/2/users/me"
     access_token_body = json.dumps(

From 7aa612b7e5a0d1d3337a03851967dd74c5be4653 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Nov 2025 07:31:25 +0000
Subject: [PATCH 21/26] fix(deps): update dependency ty to v0.0.1a26

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5d6d1b394..b5be5fdfd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ dev = [
   "pytest-xdist==3.8.0",
   "pytest==9.0.0",
   "responses==0.25.8",
-  "ty==0.0.1a23",
+  "ty==0.0.1a26",
   "types-defusedxml==0.7.0.20250822",
   "types-oauthlib==3.3.0.20250822",
   "types-requests-oauthlib==2.0.0.20250809",
@@ -84,7 +84,7 @@ dev = [
   "pytest-xdist==3.8.0",
   "pytest==9.0.0",
   "responses==0.25.8",
-  "ty==0.0.1a23",
+  "ty==0.0.1a26",
   "types-defusedxml==0.7.0.20250822",
   "types-oauthlib==3.3.0.20250822",
   "types-requests-oauthlib==2.0.0.20250809",

From 84ab57c33ce016f8a6b0ef54ce43f0a995ac31c4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 11 Nov 2025 07:53:54 +0000
Subject: [PATCH 22/26] Add extra_settings and auth_handlers to
 OAuth2TestProtocol

Added missing methods that mixins call via super():
- extra_settings() -> dict[str, str | list[str]]
- auth_handlers(start_url: str) -> str

This reduces type errors from 78 to 76. Remaining 76 errors are
pre-existing issues about subscripting potentially None objects,
unrelated to the Protocol changes.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/backends/oauth.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/social_core/tests/backends/oauth.py b/social_core/tests/backends/oauth.py
index 9ec945afb..3b9226d83 100644
--- a/social_core/tests/backends/oauth.py
+++ b/social_core/tests/backends/oauth.py
@@ -43,6 +43,14 @@ def do_refresh_token(self) -> tuple[User, TestUserSocialAuth]:
         """Perform a token refresh flow and return user and social auth."""
         ...
 
+    def extra_settings(self) -> dict[str, str | list[str]]:
+        """Return extra settings for the backend."""
+        ...
+
+    def auth_handlers(self, start_url: str) -> str:
+        """Handle authentication flow and return target URL."""
+        ...
+
     @property
     def name(self) -> str:
         """Backend name for settings."""

From 34dfdd7d7e2a071d2747fb3269bdb63c52608ac0 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 11 Nov 2025 08:31:31 +0000
Subject: [PATCH 23/26] Add extra_data type annotation to TestUserSocialAuth

Added `extra_data: dict[str, Any]` type annotation to TestUserSocialAuth
class. This was causing 76 type errors where the type checker thought
extra_data could be None when subscripting (e.g., social.extra_data["key"]).

With this fix, all type errors from ty v0.0.1a25 are now resolved.
Type checks pass with 0 errors.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/social_core/tests/models.py b/social_core/tests/models.py
index 5178394a4..c317f22b1 100644
--- a/social_core/tests/models.py
+++ b/social_core/tests/models.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import base64
-from typing import TypeVar
+from typing import Any, TypeVar
 
 from typing_extensions import Self
 
@@ -81,6 +81,7 @@ class TestUserSocialAuth(UserMixin, BaseModel):
     NEXT_ID = 1
     cache = {}
     cache_by_uid = {}
+    extra_data: dict[str, Any]
 
     def __init__(self, user: User, provider, uid, extra_data=None) -> None:
         self.id = TestUserSocialAuth.next_id()

From 65dccf3a0da7d1e6b7dbd3744eb60eb6bde7dd3f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 12 Nov 2025 08:46:37 +0000
Subject: [PATCH 24/26] Remove extra_data override annotation from
 TestUserSocialAuth

Removed the `extra_data: dict[str, Any]` type annotation that was causing
a reportIncompatibleVariableOverride error. The base class UserMixin
declares `extra_data: dict[str, Any] | None`, and type checkers don't
allow narrowing mutable attribute types in subclasses.

Since __init__ always assigns a dict (never None), the runtime behavior
is unchanged. Type checkers will see it as potentially None from the base
class, which matches the base class contract.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/social_core/tests/models.py b/social_core/tests/models.py
index c317f22b1..9f0567d7a 100644
--- a/social_core/tests/models.py
+++ b/social_core/tests/models.py
@@ -81,7 +81,6 @@ class TestUserSocialAuth(UserMixin, BaseModel):
     NEXT_ID = 1
     cache = {}
     cache_by_uid = {}
-    extra_data: dict[str, Any]
 
     def __init__(self, user: User, provider, uid, extra_data=None) -> None:
         self.id = TestUserSocialAuth.next_id()

From c4109438509dfe475acc8306336814f4ae0ca018 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 12 Nov 2025 11:36:42 +0000
Subject: [PATCH 25/26] Add assertion for extra_data type narrowing in tests

Added `assert self.extra_data is not None` after assignment in
TestUserSocialAuth.__init__. This narrows the type from
`dict[str, Any] | None` (from base class) to `dict[str, Any]`
for the type checker, eliminating 76 type errors where tests
subscript extra_data.

The assertion is always true since line 90 assigns `extra_data or {}`,
ensuring extra_data is never None in tests.

Co-authored-by: nijel <212189+nijel@users.noreply.github.com>
---
 social_core/tests/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/social_core/tests/models.py b/social_core/tests/models.py
index 9f0567d7a..27eb35944 100644
--- a/social_core/tests/models.py
+++ b/social_core/tests/models.py
@@ -88,6 +88,8 @@ def __init__(self, user: User, provider, uid, extra_data=None) -> None:
         self.provider = provider
         self.uid = uid
         self.extra_data = extra_data or {}
+        # Type narrowing: extra_data is always a dict in tests, never None
+        assert self.extra_data is not None
         self.user.social.append(self)
         TestUserSocialAuth.cache_by_uid[uid] = self
 

From 5de718462e36d294852b0fcdaf922fabf4701eac Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 12 Nov 2025 11:42:25 +0000
Subject: [PATCH 26/26] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 social_core/tests/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/social_core/tests/models.py b/social_core/tests/models.py
index 27eb35944..c7200a116 100644
--- a/social_core/tests/models.py
+++ b/social_core/tests/models.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import base64
-from typing import Any, TypeVar
+from typing import TypeVar
 
 from typing_extensions import Self