-

cool-RR · cool-RR · commit 1b3fed51e5f9 · 2012-05-31T14:14:58.000+03:00
diff --git a/python_toolbox/comparison_tools.py b/python_toolbox/comparison_tools.py
@@ -7,6 +7,7 @@
 
 
 def underscore_hating_key(string):
+    '''Key function for sorting that treats `_` as last character.'''
     assert isinstance(string, basestring)
     return unicode(string).replace('_', unichr(sys.maxunicode))
 
diff --git a/python_toolbox/cute_iter_tools.py b/python_toolbox/cute_iter_tools.py
@@ -38,6 +38,17 @@ def consecutive_pairs(iterable, wrap_around=False):
         # `first_item`, because it may need to be garbage-collected:
         del first_item 
     
+    try:
+        second_item = iterator.next()
+    except StopIteration:
+        if wrap_around:
+            yield (first_item, first_item)
+        raise StopIteration
+    
+    current = second_item
+    yield (old, current)
+    old = current
+    
     for current in iterator:
         yield (old, current)
         old = current
diff --git a/test_python_toolbox/test_cute_iter_tools/test_consecutive_pairs.py b/test_python_toolbox/test_cute_iter_tools/test_consecutive_pairs.py
@@ -24,5 +24,8 @@ def test():
                                           
     assert tuple(consecutive_pairs('meow')) == \
            (('m', 'e'), ('e', 'o'), ('o', 'w'))
+    
+    assert tuple(consecutive_pairs([1], wrap_around=True)) == \
+           ((1, 1),)
            
            
