diff --git a/tests/managers.py b/tests/managers.py index 03ea473..640420c 100644 --- a/tests/managers.py +++ b/tests/managers.py @@ -1,13 +1,6 @@ -from model_utils.managers import SoftDeletableManager, SoftDeletableQuerySet +from model_utils.managers import SoftDeletableQuerySet class CustomSoftDeleteQuerySet(SoftDeletableQuerySet): def only_read(self): return self.filter(is_read=True) - - -class CustomSoftDeleteManager(SoftDeletableManager): - _queryset_class = CustomSoftDeleteQuerySet - - def only_read(self): - return self.get_queryset().only_read() diff --git a/tests/models.py b/tests/models.py index 44f7590..b5b4f37 100644 --- a/tests/models.py +++ b/tests/models.py @@ -9,7 +9,12 @@ from django.utils.translation import gettext_lazy as _ from model_utils import Choices from model_utils.fields import MonitorField, SplitField, StatusField, UUIDField -from model_utils.managers import InheritanceManager, JoinManager, QueryManager +from model_utils.managers import ( + InheritanceManager, + JoinManager, + QueryManager, + SoftDeletableManager, +) from model_utils.models import ( SoftDeletableModel, StatusModel, @@ -19,7 +24,7 @@ from model_utils.models import ( ) from model_utils.tracker import FieldTracker, ModelTracker from tests.fields import MutableField -from tests.managers import CustomSoftDeleteManager +from tests.managers import CustomSoftDeleteQuerySet class InheritanceManagerTestRelated(models.Model): @@ -350,7 +355,7 @@ class SoftDeletable(SoftDeletableModel): class CustomSoftDelete(SoftDeletableModel): is_read = models.BooleanField(default=False) - objects: ClassVar[CustomSoftDeleteManager[SoftDeletableModel]] = CustomSoftDeleteManager() + objects = SoftDeletableManager.from_queryset(CustomSoftDeleteQuerySet)() # type: ignore[misc] class StringyDescriptor: