Don't throw a TypeError slicing unsorted results, fixes #6 (#7)

zopefoundation · Jun 22, 2017 · fbb0d96 · fbb0d96
1 parent 76a2777
commit fbb0d96
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,8 +4,7 @@ CHANGES
 2.4 (unreleased)
 ----------------
 
-- Nothing changed yet.
-
+- Don't throw a TypeError slicing unsorted results, fixes #6
 
 2.3 (2017-04-26)
 ----------------

diff --git a/src/hurry/query/query.py b/src/hurry/query/query.py
@@ -286,8 +286,9 @@ def searchResults(
                 selected_results = reversed(selected_results)
                 is_iterator = True
             if limit or start:
+                slice_end = limit and start + limit or None
                 selected_results = itertools.islice(
-                    selected_results, start, start + limit)
+                    selected_results, start, slice_end)
                 is_iterator = True
 
         if is_iterator:

diff --git a/src/hurry/query/query.txt b/src/hurry/query/query.txt
@@ -546,6 +546,14 @@ the tested index is deterministic enough to be used as a proper test).
   >>> displayResult(Eq(f1, 'a'), limit=2)
   [1, 2]
 
+  >>> f1 = ('catalog1', 'f1')
+  >>> displayResult(Eq(f1, 'a'), start=1)
+  [2, 6]
+
+  >>> f1 = ('catalog1', 'f1')
+  >>> displayResult(Eq(f1, 'a'), start=1, limit=1)
+  [2]
+
   >>> f1 = ('catalog1', 'f1')
   >>> displayResult(Eq(f1, 'a'), limit=2, reverse=True)
   [6, 2]