Changeset 7395

Timestamp:

03/31/08 19:25:32 (5 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Moved _merge_sanity_check into a more logical place in the
code.

Files:

• django/branches/queryset-refactor/django/db/models/query.py (modified) (2 diffs)

django/branches/queryset-refactor/django/db/models/query.py

@@ -119 +119 @@
-            raise IndexError, e.args
-
-    def _merge_sanity_check(self, other):
-        """
-        Checks that we are merging two comparable queryset classes.
-        """
-        if self.__class__ is not other.__class__:
-            raise TypeError("Cannot merge querysets of different types ('%s' and '%s'."
-                    % (self.__class__.__name__, other.__class__.__name__))
-
-    def __and__(self, other):
-        self._merge_sanity_check(other)
@@ -471 +463 @@
-                self._iter = None
-
+    def _merge_sanity_check(self, other):
+        """
+        Checks that we are merging two comparable queryset classes.
+        """
+        if self.__class__ is not other.__class__:
+            raise TypeError("Cannot merge querysets of different types ('%s' and '%s'."
+                    % (self.__class__.__name__, other.__class__.__name__))
+
-# Use the backend's QuerySet class if it defines one. Otherwise, use _QuerySet.
-if connection.features.uses_custom_queryset: