diff --git a/model_utils/managers.py b/model_utils/managers.py index 9ac0317..b1ccda2 100644 --- a/model_utils/managers.py +++ b/model_utils/managers.py @@ -170,14 +170,14 @@ class InheritanceQuerySet(QuerySet): class InheritanceManager(models.Manager): use_for_related_fields = True - def get_query_set(self): + def get_queryset(self): return InheritanceQuerySet(self.model) def select_subclasses(self, *subclasses): - return self.get_query_set().select_subclasses(*subclasses) + return self.get_queryset().select_subclasses(*subclasses) def get_subclass(self, *args, **kwargs): - return self.get_query_set().get_subclass(*args, **kwargs) + return self.get_queryset().get_subclass(*args, **kwargs) class QueryManager(models.Manager): @@ -195,8 +195,8 @@ class QueryManager(models.Manager): self._order_by = args return self - def get_query_set(self): - qs = super(QueryManager, self).get_query_set().filter(self._q) + def get_queryset(self): + qs = super(QueryManager, self).get_queryset().filter(self._q) if self._order_by is not None: return qs.order_by(*self._order_by) return qs @@ -206,7 +206,7 @@ class PassThroughManager(models.Manager): """ Inherit from this Manager to enable you to call any methods from your custom QuerySet class from your manager. Simply define your QuerySet - class, and return an instance of it from your manager's `get_query_set` + class, and return an instance of it from your manager's `get_queryset` method. Alternately, if you don't need any extra methods on your manager that @@ -232,10 +232,10 @@ class PassThroughManager(models.Manager): def __getattr__(self, name): if name in self._deny_methods: raise AttributeError(name) - return getattr(self.get_query_set(), name) + return getattr(self.get_queryset(), name) - def get_query_set(self): - qs = super(PassThroughManager, self).get_query_set() + def get_queryset(self): + qs = super(PassThroughManager, self).get_queryset() if self._queryset_cls is not None: qs = qs._clone(klass=self._queryset_cls) return qs @@ -250,8 +250,8 @@ def create_pass_through_manager_for_queryset_class(base, queryset_cls): def __init__(self): return super(_PassThroughManager, self).__init__() - def get_query_set(self): - qs = super(_PassThroughManager, self).get_query_set() + def get_queryset(self): + qs = super(_PassThroughManager, self).get_queryset() return qs._clone(klass=queryset_cls) def __reduce__(self): diff --git a/model_utils/tests/models.py b/model_utils/tests/models.py index 9dd4364..2d5ff25 100644 --- a/model_utils/tests/models.py +++ b/model_utils/tests/models.py @@ -191,7 +191,7 @@ class ByAuthorQuerySet(models.query.QuerySet, AuthorMixin): class FeaturedManager(models.Manager): - def get_query_set(self): + def get_queryset(self): kwargs = {} if hasattr(self, "_db"): kwargs["using"] = self._db @@ -215,7 +215,7 @@ class DudeQuerySet(models.query.QuerySet): class AbidingManager(PassThroughManager): - def get_query_set(self): + def get_queryset(self): return DudeQuerySet(self.model).abiding() def get_stats(self): @@ -243,8 +243,8 @@ class Car(models.Model): class SpotManager(PassThroughManager): - def get_query_set(self): - return super(SpotManager, self).get_query_set().filter(secret=False) + def get_queryset(self): + return super(SpotManager, self).get_queryset().filter(secret=False) class SpotQuerySet(models.query.QuerySet):