Ticket #17600: exclude.r17463.diff

db/models/query.py

@@ -631 +631 @@
         if args or kwargs:
             assert self.query.can_filter(), \
                     "Cannot filter a query once a slice has been taken."
-
         clone = self._clone()
+        lookup = Q(*args, **kwargs)
         if negate:
-            clone.query.add_q(~Q(*args, **kwargs))
-        else:
-            clone.query.add_q(Q(*args, **kwargs))
+            lookup.negate_last_node()
+        clone.query.add_q(lookup)
         return clone
 
     def complex_filter(self, filter_obj):

db/models/query_utils.py

@@ -43 +43 @@
     def __init__(self, *args, **kwargs):
         super(Q, self).__init__(children=list(args) + kwargs.items())
 
+    def negate_last_node(self):
+        if not self.children:
+            return
+        for child in self.children:
+            if not isinstance(child, tree.Node):
+                self.negated = True
+            else:
+                child.negate_last_node()
+
     def _combine(self, other, conn):
         if not isinstance(other, Q):
             raise TypeError(other)