fix: type as vars

codeforlife/request.py

@@ -18,7 +18,9 @@
     from .user.models import User
     from .user.models.session import SessionStore
 
-AnyUser = t.TypeVar("AnyUser")
+    AnyUser = t.TypeVar("AnyUser", bound=User)
+else:
+    AnyUser = t.TypeVar("AnyUser")
 
 
 # pylint: disable-next=missing-class-docstring

codeforlife/tests/api.py

@@ -17,24 +17,16 @@
 from .test import TestCase
 
 if t.TYPE_CHECKING:
-    from ..user.models import (
-        AdminSchoolTeacherUser,
-        AuthFactor,
-        IndependentUser,
-        NonAdminSchoolTeacherUser,
-        NonSchoolTeacherUser,
-        SchoolTeacherUser,
-        StudentUser,
-        TeacherUser,
-        TypedUser,
-        User,
-    )
+    from ..user.models import TypedUser, User
 
     RequestUser = t.TypeVar("RequestUser", bound=User)
     LoginUser = t.TypeVar("LoginUser", bound=User)
+else:
+    RequestUser = t.TypeVar("RequestUser")
+    LoginUser = t.TypeVar("LoginUser")
 
 
-class APIClient(_APIClient, t.Generic["RequestUser"]):
+class APIClient(_APIClient, t.Generic[RequestUser]):
     """Base API client to be inherited by all other API clients."""
 
     _test_case: "APITestCase[RequestUser]"
@@ -58,7 +50,7 @@ def __init__(
         )
 
     @classmethod
-    def get_request_user_class(cls) -> t.Type["RequestUser"]:
+    def get_request_user_class(cls) -> t.Type[RequestUser]:
         """Get the request's user class.
 
         Returns:
@@ -120,7 +112,7 @@ def _make_assertions():
     # Login Helpers
     # --------------------------------------------------------------------------
 
-    def _login_user_type(self, user_type: t.Type["LoginUser"], **credentials):
+    def _login_user_type(self, user_type: t.Type[LoginUser], **credentials):
         # pylint: disable-next=import-outside-toplevel
         from ..user.models import AuthFactor
 
@@ -140,7 +132,7 @@ def _login_user_type(self, user_type: t.Type["LoginUser"], **credentials):
             with patch.object(timezone, "now", return_value=now):
                 assert super().login(
                     request=self.request_factory.post(
-                        user=t.cast("RequestUser", user)
+                        user=t.cast(RequestUser, user)
                     ),
                     otp=otp,
                 ), f'Failed to login with OTP "{otp}" at {now}.'
@@ -524,14 +516,14 @@ def options(  # type: ignore[override]
     # pylint: enable=too-many-arguments,redefined-builtin
 
 
-class APITestCase(TestCase, t.Generic["RequestUser"]):
+class APITestCase(TestCase, t.Generic[RequestUser]):
     """Base API test case to be inherited by all other API test cases."""
 
-    client: APIClient["RequestUser"]
-    client_class: t.Type[APIClient["RequestUser"]] = APIClient
+    client: APIClient[RequestUser]
+    client_class: t.Type[APIClient[RequestUser]] = APIClient
 
     @classmethod
-    def get_request_user_class(cls) -> t.Type["RequestUser"]:
+    def get_request_user_class(cls) -> t.Type[RequestUser]:
         """Get the request's user class.
 
         Returns: