Woohoo

Author: kingbuzzman

pytest_django/asserts.py

@@ -56,7 +56,8 @@ def assertion_func(*args: Any, **kwargs: Any) -> Any:
 
 if TYPE_CHECKING:
     from collections.abc import Collection, Iterator, Sequence
-    from typing import ContextManager, overload
+    from contextlib import AbstractContextManager
+    from typing import overload
 
     from django import forms
     from django.db.models import Model, QuerySet, RawQuerySet
@@ -215,7 +216,7 @@ def assertQuerySetEqual(
     @overload
     def assertNumQueries(
         num: int, func: None = None, *, using: str = ...
-    ) -> ContextManager[None]: ...
+    ) -> AbstractContextManager[None]: ...
 
     @overload
     def assertNumQueries(

pytest_django/django_compat.py

@@ -2,9 +2,23 @@
 # this is the case before you call them.
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
 
+if TYPE_CHECKING:
+    from typing import TypeAlias
+
+    from django.contrib.auth.models import AbstractBaseUser
+
+    _User: TypeAlias = AbstractBaseUser
+
+    _UserModel: TypeAlias = type[_User]
+
+    __all__ = ("_User", "_UserModel")
+
+
 def is_django_unittest(request_or_item: pytest.FixtureRequest | pytest.Item) -> bool:
     """Returns whether the request or item is a Django test case."""
     from django.test import SimpleTestCase

pytest_django/fixtures.py

@@ -22,6 +22,7 @@
     import django.test
 
     from . import DjangoDbBlocker
+    from .django_compat import _User, _UserModel
 
 
 _DjangoDbDatabases = Optional[Union[Literal["__all__"], Iterable[str]]]
@@ -458,15 +459,15 @@ def async_client() -> django.test.AsyncClient:
 
 
 @pytest.fixture
-def django_user_model(db: None) -> type[django.contrib.auth.models.User]:
+def django_user_model(db: None) -> _UserModel:
     """The class of Django's user model."""
     from django.contrib.auth import get_user_model
 
     return get_user_model()  # type: ignore[no-any-return]
 
 
 @pytest.fixture
-def django_username_field(django_user_model: type[django.contrib.auth.models.User]) -> str:
+def django_username_field(django_user_model: _UserModel) -> str:
     """The fieldname for the username used with Django's user model."""
     field: str = django_user_model.USERNAME_FIELD
     return field
@@ -475,9 +476,9 @@ def django_username_field(django_user_model: type[django.contrib.auth.models.Use
 @pytest.fixture
 def admin_user(
     db: None,
-    django_user_model: type[django.contrib.auth.models.User],
+    django_user_model: _User,
     django_username_field: str,
-) -> django.contrib.auth.models.User:
+) -> _User:
     """A Django admin user.
 
     This uses an existing user with username "admin", or creates a new one with
@@ -506,7 +507,7 @@ def admin_user(
 @pytest.fixture
 def admin_client(
     db: None,
-    admin_user: django.contrib.auth.models.User,
+    admin_user: _User,
 ) -> django.test.Client:
     """A Django test client logged in as an admin user."""
     from django.test import Client

pytest_django/plugin.py

@@ -573,7 +573,7 @@ def _django_setup_unittest(
 
     original_runtest = TestCaseFunction.runtest
 
-    def non_debugging_runtest(self) -> None:
+    def non_debugging_runtest(self) -> None:  # noqa: ANN001
         self._testcase(result=self)
 
     from django.test import SimpleTestCase

tests/test_fixtures.py

@@ -29,7 +29,7 @@
 
 
 if TYPE_CHECKING:
-    from django.contrib.auth.models import User
+    from pytest_django.django_compat import _User, _UserModel
 
 
 @contextmanager
@@ -67,7 +67,7 @@ def test_admin_client_no_db_marker(db: None, admin_client: Client) -> None:
 
 # For test below.
 @pytest.fixture
-def existing_admin_user(django_user_model: type[User]) -> User:
+def existing_admin_user(django_user_model: _UserModel) -> _User:
     return django_user_model._default_manager.create_superuser("admin", None, None)