Fix type errors from ty v0.0.1a25 upgrade

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",

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:

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):

social_core/backends/vk.py

@@ -196,7 +196,7 @@
             if user_check == 1:
                 is_user = self.data.get("is_app_user")
             elif user_check == 2:
                 is_user = self.vk_api("isAppUser", {"user_id": user_id}).get(
                     "response", 0
                 )
             if not int(is_user):
@@ -210,7 +210,7 @@
                 self.id_key(): user_id,
             },
         }
         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)

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
+            url,
+            auth=HTTPBasicAuth(*self.get_key_and_secret()),
+            **request_args,  # type: ignore[arg-type]
         )
         return self.process_refresh_token_response(request, *args, **kwargs)
 

social_core/strategy.py

@@ -213,7 +213,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
 

social_core/tests/backends/oauth.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Generic, TypeVar, cast
+from typing import TYPE_CHECKING, Generic, Protocol, TypeVar, cast
 from unittest.mock import patch
 from urllib.parse import urlparse
 
@@ -13,9 +13,50 @@
 
 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.
+    """
+
+    def assertEqual(self, first: object, second: object, msg: object = None) -> None:
+        """Assert that two values are equal."""
+        ...
+
+    def do_login(self) -> User:
+        """Perform a login flow and return the user."""
+        ...
+
+    def do_partial_pipeline(self) -> User:
+        """Perform a partial pipeline flow and return the user."""
+        ...
+
+    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."""
+        ...
+
+
 class BaseOAuthTest(BaseBackendTest[OAuthBackendT], Generic[OAuthBackendT]):
     user_data_body: str | None = None
     user_data_url: str = ""

social_core/tests/backends/open_id.py

@@ -32,6 +32,10 @@ def handle_starttag(self, tag, attrs) -> None:
 
 
 class OpenIdTest(BaseBackendTest):
+    # These attributes must be defined by subclasses
+    discovery_body: str
+    server_response: str
+
     def setUp(self) -> None:
         responses.start()
         Backend = module_member(self.backend_path)

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"
@@ -86,20 +92,20 @@
 
         social = user.social[0]
         self.assertEqual(social.uid, "1")
         self.assertEqual(social.extra_data["first_name"], "Erlich")
         self.assertEqual(social.extra_data["last_name"], "Bachman")
         self.assertEqual(social.extra_data["email"], "[email protected]")
         self.assertEqual(social.extra_data["name"], "erlich-bachman")
         self.assertEqual(social.extra_data["username"], "erlich-bachman")
         self.assertEqual(social.extra_data["display_name"], "Erlich Bachman")
         self.assertEqual(social.extra_data["type"], "NORMAL")
         self.assertEqual(social.extra_data["active"], True)
         self.assertEqual(
             social.extra_data["url"],
             "https://bachmanity.atlassian.net/users/erlich-bachman",
         )
         self.assertEqual(
             social.extra_data["avatar_url"],
             "http://www.gravatar.com/avatar/af7d968fe79ea45271e3100391824b79.jpg?s=48&d=mm",
         )
         self.assertEqual(social.extra_data["scope"], "PUBLIC_REPOS")

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(
         {

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(

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
 

social_core/tests/test_utils.py

@@ -213,7 +213,8 @@ def _backend(self, session_kwargs=None):
 class GetKeyAndSecretBasicAuthTest(unittest.TestCase):
     def setUp(self) -> None:
         self.backend = BaseAuth(strategy=Mock())
-        self.backend.setting = Mock(
+        # 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"
         )