-

cool-RR · cool-RR · commit a9d170b28e82 · 2013-08-19T03:34:59.000+03:00
diff --git a/python_toolbox/cute_iter_tools.py b/python_toolbox/cute_iter_tools.py
@@ -36,24 +36,29 @@ def get_consecutive_subsequences(iterable, length=2, wrap_around=False):
     iterator = iter(iterable)
     
     first_items = get_items(iterator, length)
-    if wrap_around:
-        if len(first_items) < length:
+    if len(first_items) < length:
+        if wrap_around:
             raise NotImplementedError(
                 '`length` is greater than the length of the iterable, and '
                 '`wrap_around` is set to `True`. Behavior for this is not '
                 'implemented, because it would require repeating some members '
                 'more than once.'
             )
+        else:
+            raise StopIteration
+            
+    if wrap_around:
         first_items_except_last = first_items[:-1]
         iterator = itertools.chain(iterator, first_items_except_last)
             
     deque = collections.deque(first_items)
     yield first_items
     
-    if not wrap_around:
-        # If `wrap_around` is `False`, we avoid holding a reference to items in
-        # `first_items`, because they may need to be garbage-collected:
-        del first_items
+    # Allow `first_items` to be garbage-collected:
+    del first_items
+    # (Assuming `wrap_around` is `True`, because if it's `False` then all the
+    # first items except the last will stay saved in
+    # `first_items_except_last`.)
     
     for current in iterator:
         deque.popleft()
