Description:

These were deprecated in django r8191 per django #7830 (http://code.djangoproject.com/ticket/7830)

Testing Done:

Not sure if djblets has unit tests or how to run them.

Diff revision 1 (Latest)

Files Changed:

 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 from django.db import models, IntegrityError
-from django.db.models.query import Q, QAnd, QOr
+from django.db.models.query import Q
+#
 # This is a hack to work around the stupid default behavior of Q objects and OR
 # operators.  By default, querying (Q(x) | Q(y)) | Q(z) when foreign keys are
     "Replaces all INNER JOINs with LEFT OUTER JOINs inside"
     def __init__(self, q):
         self.q = q
     def __and__(self, other):
-        return QAnd(self, other)
+        return self & other
     def __or__(self, other):
-        return QOr(self, other)
+        return self | other
     def get_sql(self, opts):
         joins, where, params = self.q.get_sql(opts)
         for join_name, join in joins.iteritems():
             joins[join_name] = (join[0], "LEFT OUTER JOIN", join[2])

Review Board