Merge pull request #76 from jpic/master

Support filter(*args)

queryset_sequence/__init__.py

@@ -685,12 +685,12 @@ def _filter_or_exclude_querysets(self, negate, **kwargs):
         self._querysets = [self._querysets[i] for i in self._queryset_idxs]
 
     # Methods that return new QuerySets
-    def filter(self, **kwargs):
+    def filter(self, *args, **kwargs):
         qss_fields, fields = self._separate_filter_fields(**kwargs)
 
         clone = self._clone()
         clone._filter_or_exclude_querysets(False, **qss_fields)
-        clone._querysets = [qs.filter(**fields) for qs in clone._querysets]
+        clone._querysets = [qs.filter(*args, **fields) for qs in clone._querysets]
         return clone
 
     def exclude(self, **kwargs):

tests/test_querysetsequence.py

@@ -8,7 +8,7 @@
                                     FieldError,
                                     MultipleObjectsReturned,
                                     ObjectDoesNotExist)
-from django.db.models import Count
+from django.db.models import Count, Q
 from django.db.models.query import EmptyQuerySet
 from django.test import TestCase
 
@@ -443,6 +443,17 @@ def test_filter_by_relation(self):
         with self.assertNumQueries(2):
             self.assertEqual(bob_qss.count(), 3)
 
+    def test_filter_args(self):
+        """
+        Ensure that filter() properly filters the children QuerySets, even when
+        being passed args.
+        """
+        # Filter to just Bob's work.
+        with self.assertNumQueries(0):
+            bob_qss = self.all.filter(Q(author=self.bob))
+        with self.assertNumQueries(2):
+            self.assertEqual(bob_qss.count(), 3)
+
     def test_empty(self):
         """
         Ensure that filter() works when it results in an empty QuerySet.