From 1b38309d70efc122720d9c5d3fcc6d362436ed62 Mon Sep 17 00:00:00 2001 From: Filip Kucharczyk Date: Fri, 6 Dec 2019 10:14:22 +0100 Subject: [PATCH] Revert 'empty' usage to it's previous state --- mongoengine/queryset/base.py | 2 +- mongoengine/queryset/visitor.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py index c6f467cc..a648391e 100644 --- a/mongoengine/queryset/base.py +++ b/mongoengine/queryset/base.py @@ -686,7 +686,7 @@ class BaseQuerySet(object): .. versionchanged:: 0.6 Raises InvalidQueryError if filter has been set """ queryset = self.clone() - if queryset._query_obj: + if not queryset._query_obj.empty: msg = "Cannot use a filter whilst using `with_id`" raise InvalidQueryError(msg) return queryset.filter(pk=object_id).first() diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py index 7faed897..470839c1 100644 --- a/mongoengine/queryset/visitor.py +++ b/mongoengine/queryset/visitor.py @@ -102,14 +102,14 @@ class QNode(object): return self # Or if this Q is empty, ignore it and just use `other`. - if not self: + if self.empty: return other return QCombination(operation, [self, other]) @property def empty(self): - msg = "'empty' property is deprecated in favour of using 'not bool(filter)" + msg = "'empty' property is deprecated in favour of using 'not bool(filter)'" warnings.warn(msg, DeprecationWarning) return False @@ -154,7 +154,7 @@ class QCombination(QNode): @property def empty(self): - msg = "'empty' property is deprecated in favour of using 'not bool(filter)" + msg = "'empty' property is deprecated in favour of using 'not bool(filter)'" warnings.warn(msg, DeprecationWarning) return not bool(self.children)