Prepare queryset_transform for Django 1.9

matthiask · matthiask · commit 0e73afe92828 · 2015-09-30T09:28:37.000+02:00
diff --git a/feincms/utils/queryset_transform.py b/feincms/utils/queryset_transform.py
@@ -90,9 +90,10 @@ class TransformQuerySet(models.query.QuerySet):
     def __init__(self, *args, **kwargs):
         super(TransformQuerySet, self).__init__(*args, **kwargs)
         self._transform_fns = []
+        self._orig_iterable_class = getattr(self, '_iterable_class', None)
 
-    def _clone(self, klass=None, setup=False, **kw):
-        c = super(TransformQuerySet, self)._clone(klass, setup, **kw)
+    def _clone(self, *args, **kwargs):
+        c = super(TransformQuerySet, self)._clone(*args, **kwargs)
         c._transform_fns = self._transform_fns[:]
         return c
 
@@ -103,12 +104,18 @@ def transform(self, *fn):
 
     def iterator(self):
         result_iter = super(TransformQuerySet, self).iterator()
-        if self._transform_fns:
-            results = list(result_iter)
-            for fn in self._transform_fns:
-                fn(results)
-            return iter(results)
-        return result_iter
+
+        if not self._transform_fns:
+            return result_iter
+
+        if getattr(self, '_iterable_class', None) != self._orig_iterable_class:
+            # Do not process the result of values() and values_list()
+            return result_iter
+
+        results = list(result_iter)
+        for fn in self._transform_fns:
+            fn(results)
+        return iter(results)
 
 
 if hasattr(models.Manager, 'from_queryset'):
