Ticket #16979: df1.2.diff

db/models/query_utils.py

@@ -43 +43 @@
     default = AND
 
     def __init__(self, *args, **kwargs):
-        children = list(args)
-        for k,v in kwargs.items():
-            if isinstance(v, tree.Node):
-                children.append(v._prefix(k+'__'))
-            else:
-                children.append((k,v))
-        super(Q, self).__init__(children=children)
+        super(Q, self).__init__(children=list(args) + kwargs.items())
 
     def _combine(self, other, conn):
         if not isinstance(other, Q):

utils/tree.py

@@ -5 +5 @@
 
 from django.utils.copycompat import deepcopy
 
-
-def _t_prefix (t, pfx):
-        """adds pfx to the first member of any tuple in the tree."""
-        import copy
-
-        if isinstance(t, tuple):
-                return ((pfx+t[0],)+t[1:])
-
-        elif isinstance(t, list):
-                return map(lambda x: _t_prefix(x, pfx), t)
-
-        elif isinstance (t, Node):
-                t2 = copy.copy(t)
-                t2.children = _t_prefix(t2.children, pfx)
-                t2.subtree_parents = _t_prefix(t2.subtree_parents, pfx)
-                return t2
-
-
 class Node(object):
     """
     A single internal node in the tree graph. A Node should be viewed as a
@@ -63 +45 @@
         return obj
     _new_instance = classmethod(_new_instance)
 
-    def _prefix(self, pfx):
-        return _t_prefix(self, pfx)
-
     def __str__(self):
         if self.negated:
             return '(NOT (%s: %s))' % (self.connector, ', '.join([str(c) for c