Fix descending in iterview.

atomatt · atomatt · commit cb78f44e365c · 2013-04-25T12:04:17.000+02:00
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -856,8 +856,11 @@ def iterview(self, name, batch, wrapper=None, **options):
         while True:
             loop_limit = min(limit or batch, batch)
             # Get rows in batches, with one extra for start of next batch.
-            options.update(limit=loop_limit + 1, startkey=startkey,
-                           startkey_docid=startkey_docid)
+            options.update(limit=loop_limit + 1)
+            # Add start keys, if any.
+            if startkey is not None: # XXX todo: None is a valid key value
+                options.update(startkey=startkey,
+                               startkey_docid=startkey_docid)
             rows = list(self.view(name, wrapper, **options))
             # Yield rows from this batch.
             for row in itertools.islice(rows, loop_limit):
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -776,6 +776,12 @@ def test_limit(self):
         self.assertEqual([self.docfromrow(doc) for doc in self.db.iterview('test/nums', limit, limit=limit)],
                          [self.docfromnum(x) for x in xrange(limit)])
 
+    def test_descending(self):
+        self.assertEqual([self.docfromrow(doc) for doc in self.db.iterview('test/nums', 10, descending=True)],
+                         [self.docfromnum(x) for x in xrange(self.num_docs - 1, -1, -1)])
+        self.assertEqual([self.docfromrow(doc) for doc in self.db.iterview('test/nums', 10, limit=int(self.num_docs / 4), descending=True)],
+                         [self.docfromnum(x) for x in xrange(self.num_docs - 1, int(self.num_docs * 3 / 4) - 1, -1)])
+
 
 def suite():
     suite = unittest.TestSuite()
