Missing better handling of the current User model

Author: kingbuzzman

pytest_django/asserts.py

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

pytest_django/fixtures.py

@@ -462,7 +462,7 @@ def django_user_model(db: None) -> type[django.contrib.auth.models.User]:
     """The class of Django's user model."""
     from django.contrib.auth import get_user_model
 
-    return get_user_model()
+    return get_user_model()  # type: ignore[no-any-return]
 
 
 @pytest.fixture

pytest_django/plugin.py

@@ -54,7 +54,7 @@
 
 
 if TYPE_CHECKING:
-    from typing import Any, NoReturn, Self
+    from typing import Any, NoReturn
 
     import django
 
@@ -573,7 +573,7 @@ def _django_setup_unittest(
 
     original_runtest = TestCaseFunction.runtest
 
-    def non_debugging_runtest(self: Self) -> None:
+    def non_debugging_runtest(self) -> None:
         self._testcase(result=self)
 
     from django.test import SimpleTestCase