diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 4163ce9e6d..d76057e9fb 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -937,10 +937,10 @@ class QuerySet(object): using=self.db) def _clone(self, klass=None, setup=False, **kwargs): + base_queryset_class = getattr(self, '_base_queryset_class', self.__class__) if klass is None: klass = self.__class__ - elif not issubclass(self.__class__, klass): - base_queryset_class = getattr(self, '_base_queryset_class', self.__class__) + elif not (issubclass(base_queryset_class, klass) or issubclass(klass, base_queryset_class)): class_bases = (klass, base_queryset_class) class_dict = { '_base_queryset_class': base_queryset_class, |