From d07b992b940dfae69fc8bf5e91a354ee4f8c11b9 Mon Sep 17 00:00:00 2001 From: Romain G Date: Thu, 12 Jan 2017 18:34:47 +0000 Subject: [PATCH] Drop old get_query_set syntax, replaced by get_queryset now --- model_utils/managers.py | 11 +---------- model_utils/tests/models.py | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/model_utils/managers.py b/model_utils/managers.py index 6558bf9..6ec9301 100644 --- a/model_utils/managers.py +++ b/model_utils/managers.py @@ -199,8 +199,6 @@ class InheritanceManagerMixin(object): def get_queryset(self): return self._queryset_class(self.model) - get_query_set = get_queryset - def select_subclasses(self, *subclasses): return self.get_queryset().select_subclasses(*subclasses) @@ -228,16 +226,11 @@ class QueryManagerMixin(object): return self def get_queryset(self): - try: - qs = super(QueryManagerMixin, self).get_queryset().filter(self._q) - except AttributeError: - qs = super(QueryManagerMixin, self).get_query_set().filter(self._q) + qs = super(QueryManagerMixin, self).get_queryset().filter(self._q) if self._order_by is not None: return qs.order_by(*self._order_by) return qs - get_query_set = get_queryset - class QueryManager(QueryManagerMixin, models.Manager): pass @@ -278,8 +271,6 @@ class SoftDeletableManagerMixin(object): return self._queryset_class(**kwargs).filter(is_removed=False) - get_query_set = get_queryset - class SoftDeletableManager(SoftDeletableManagerMixin, models.Manager): pass diff --git a/model_utils/tests/models.py b/model_utils/tests/models.py index 8043c9f..db13413 100644 --- a/model_utils/tests/models.py +++ b/model_utils/tests/models.py @@ -210,8 +210,6 @@ class FeaturedManager(models.Manager): kwargs["using"] = self._db return ByAuthorQuerySet(self.model, **kwargs).filter(feature=True) - get_query_set = get_queryset - class Tracked(models.Model): name = models.CharField(max_length=20)