-

cool-RR · cool-RR · commit 7b90fd180ec5 · 2014-02-22T15:41:02.000+02:00
diff --git a/source_py2/python_toolbox/__init__.py b/source_py2/python_toolbox/__init__.py
@@ -17,6 +17,6 @@
 import python_toolbox.monkeypatch_envelopes
 import python_toolbox.monkeypatch_pathlib
 
-__version_info__ = python_toolbox.version_info.VersionInfo(0, 6, 9)
+__version_info__ = python_toolbox.version_info.VersionInfo(0, 6, 10)
 __version__ = __version_info__.version_text
 
diff --git a/source_py2/python_toolbox/misc_tools/misc_tools.py b/source_py2/python_toolbox/misc_tools/misc_tools.py
@@ -304,6 +304,7 @@ def repeat_getattr(thing, query):
         current = getattr(current, attribute_name)
     return current
 
+
 def set_attributes(**kwargs):
     '''
     Decorator to set attributes on a function.
diff --git a/source_py2/test_python_toolbox/test_address_tools/test_describe.py b/source_py2/test_python_toolbox/test_address_tools/test_describe.py
@@ -27,9 +27,9 @@ def test_on_locally_defined_class():
     # Testing for locally defined class:
     
     
-    if python_toolbox.__version_info__ <= (0, 6, 9, 'release'):
+    if python_toolbox.__version_info__ <= (0, 6, 10, 'release'):
         raise nose.SkipTest("This test doesn't pass in `python_toolbox` "
-                            "version 0.6.9 and below, because `describe` :"
+                            "version 0.6.10 and below, because `describe` :"
                             "doesn't support nested classes yet.")
     
     result = describe(A.B)
@@ -247,9 +247,9 @@ def test_bad_module_name():
 
 def test_function_in_something():
     '''Test `describe` doesn't fail when describing `{1: sum}`.'''
-    if python_toolbox.__version_info__ <= (0, 6, 9, 'release'):
+    if python_toolbox.__version_info__ <= (0, 6, 10, 'release'):
         raise nose.SkipTest("This test doesn't pass in `python_toolbox`"
-                            "version 0.6.9 and below.")
+                            "version 0.6.10 and below.")
     assert describe({1: sum}) == '{1: sum}'
     assert describe((sum, sum, list, chr)) == '(sum, sum, list, chr)'
     
diff --git a/source_py2/test_python_toolbox/test_caching/test_cache.py b/source_py2/test_python_toolbox/test_caching/test_cache.py
@@ -12,19 +12,19 @@
 
 from python_toolbox import caching
 from python_toolbox.caching import cache
+from python_toolbox import misc_tools
 from python_toolbox import temp_value_setting
 from python_toolbox import cute_testing
 from python_toolbox import gc_tools
 
 
+@misc_tools.set_attributes(i=0)
 def counting_func(a=1, b=2, *args, **kwargs):
     '''Function that returns a bigger number every time.'''
-    if not hasattr(counting_func, 'i'):
-        counting_func.i = 0
     try:
         return counting_func.i
     finally:
-        counting_func.i = (counting_func.i + 1)
+        counting_func.i += 1
 
         
 def test_basic():
diff --git a/source_py2/test_python_toolbox/test_caching/test_cached_property.py b/source_py2/test_python_toolbox/test_caching/test_cached_property.py
@@ -6,18 +6,18 @@
 import nose
 
 from python_toolbox import context_management
+from python_toolbox import misc_tools
 
 from python_toolbox.caching import cache, CachedType, CachedProperty
 
 
+@misc_tools.set_attributes(i=0)
 def counting_func(self):
     '''Return a bigger number every time.'''
-    if not hasattr(counting_func, 'i'):
-        counting_func.i = 0
     try:
         return counting_func.i
     finally:
-        counting_func.i = (counting_func.i + 1)
+        counting_func.i += 1
     
         
 def test():
diff --git a/source_py2/test_python_toolbox/test_context_management/test_external.py b/source_py2/test_python_toolbox/test_context_management/test_external.py
@@ -85,7 +85,7 @@ def woohoo():
         self.assertEqual(state, [1, 42, 999])
 
     def _create_contextmanager_attribs(self):
-        if python_toolbox.__version_info__ <= (0, 6, 9, 'release'):
+        if python_toolbox.__version_info__ <= (0, 6, 10, 'release'):
             raise nose.SkipTest
         def attribs(**kw):
             def decorate(func):
@@ -107,7 +107,7 @@ def test_contextmanager_attribs(self):
     @unittest2.skipIf(hasattr(sys, 'flags') and sys.flags.optimize >= 2,
                       "Docstrings are omitted with -O2 and above")
     def test_contextmanager_doc_attrib(self):
-        if python_toolbox.__version_info__ <= (0, 6, 9, 'release'):
+        if python_toolbox.__version_info__ <= (0, 6, 10, 'release'):
             raise nose.SkipTest('Not sure what to do about this.')
         baz = self._create_contextmanager_attribs()
         self.assertEqual(baz.__doc__, "Whee!")
@@ -212,7 +212,7 @@ def method(self, a, b, c=None):
 
 
     def test_typo_enter(self):
-        if python_toolbox.__version_info__ <= (0, 6, 9, 'release'):
+        if python_toolbox.__version_info__ <= (0, 6, 10, 'release'):
             raise nose.SkipTest
         class MyContextManager(ContextManager):
             def __unter__(self):
@@ -226,7 +226,7 @@ def __exit__(self, *exc):
 
 
     def test_typo_exit(self):
-        if python_toolbox.__version_info__ <= (0, 6, 9, 'release'):
+        if python_toolbox.__version_info__ <= (0, 6, 10, 'release'):
             raise nose.SkipTest
         class MyContextManager(ContextManager):
             def __enter__(self):
diff --git a/source_py2/test_python_toolbox/test_cute_iter_tools/test_call_until_exception.py b/source_py2/test_python_toolbox/test_cute_iter_tools/test_call_until_exception.py
@@ -0,0 +1,13 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+import collections
+
+from python_toolbox.cute_iter_tools import call_until_exception
+
+
+def test():
+    
+    assert list(call_until_exception(collections.deque(range(7)).popleft,
+                                     IndexError)) == list(range(7))
+    
diff --git a/source_py2/test_python_toolbox/test_cute_iter_tools/test_double_filter.py b/source_py2/test_python_toolbox/test_cute_iter_tools/test_double_filter.py
@@ -1,6 +1,8 @@
 # Copyright 2009-2014 Ram Rachum.
 # This program is distributed under the MIT license.
 
+from python_toolbox import nifty_collections
+
 from python_toolbox.cute_iter_tools import double_filter
 
 
@@ -12,7 +14,20 @@ def test_double_filter():
     assert tuple(second_iterable) == tuple(xrange(1, 20, 2))
     
     (first_iterable, second_iterable) = \
-                        double_filter(lambda value: value % 3 == 0, xrange(20))
-    assert tuple(first_iterable) == tuple(xrange(0, 20, 3))
-    assert tuple(second_iterable) == tuple(i for i in xrange(20) if i % 3 != 0)
+                        double_filter(lambda value: value % 3 == 0, range(20))
+    assert tuple(first_iterable) == tuple(range(0, 20, 3))
+    assert tuple(second_iterable) == tuple(i for i in range(20) if i % 3 != 0)
+    
+    (first_lazy_tuple, second_lazy_tuple) = \
+        double_filter(lambda value: value % 3 == 0, range(20), lazy_tuple=True)
+    
+    assert isinstance(first_lazy_tuple, nifty_collections.LazyTuple)
+    assert isinstance(second_lazy_tuple, nifty_collections.LazyTuple)
+    assert first_lazy_tuple.collected_data == \
+                                         second_lazy_tuple.collected_data == []
+    
+    assert first_lazy_tuple == nifty_collections.LazyTuple(range(0, 20, 3))
+    assert second_lazy_tuple == nifty_collections.LazyTuple(
+        i for i in range(20) if i % 3 != 0
+    )
     
diff --git a/source_py2/test_python_toolbox/test_cute_iter_tools/test_enumerate.py b/source_py2/test_python_toolbox/test_cute_iter_tools/test_enumerate.py
@@ -3,6 +3,8 @@
 
 '''Testing module for `cute_iter_tools.enumerate`.'''
 
+
+from python_toolbox import nifty_collections
 from python_toolbox import cute_iter_tools
 
 
@@ -18,4 +20,13 @@ def test():
     for i, j in cute_iter_tools.enumerate(range(5, 0 -1), reverse_index=True):
         assert i == j
         
+    lazy_tuple = cute_iter_tools.enumerate(range(5, 0 -1), reverse_index=True,
+                                           lazy_tuple=True)
     
+    assert isinstance(lazy_tuple, nifty_collections.LazyTuple)
+    assert not lazy_tuple.collected_data
+        
+    for i, j in lazy_tuple:
+        assert i == j
+        
+    assert lazy_tuple.exhausted
diff --git a/source_py2/test_python_toolbox/test_cute_iter_tools/test_fill.py b/source_py2/test_python_toolbox/test_cute_iter_tools/test_fill.py
@@ -4,6 +4,8 @@
 import itertools
 import types
 
+from python_toolbox import nifty_collections
+
 from python_toolbox.cute_iter_tools import fill
 
 
@@ -17,4 +19,10 @@ def test():
     assert fill(range(4), fill_value_maker=iter(range(10)).next, length=7,
                 sequence_type=tuple) == (0, 1, 2, 3, 0, 1, 2)
     
+    lazy_tuple = fill(range(4), fill_value='Meow', length=7, lazy_tuple=True)
+    
+    assert isinstance(lazy_tuple, nifty_collections.LazyTuple)
+    assert not lazy_tuple.collected_data
+    
+    assert lazy_tuple == (0, 1, 2, 3, 'Meow', 'Meow', 'Meow')
                                                             
diff --git a/source_py2/test_python_toolbox/test_cute_iter_tools/test_iter_with.py b/source_py2/test_python_toolbox/test_cute_iter_tools/test_iter_with.py
@@ -5,6 +5,7 @@
 
 import itertools
 
+from python_toolbox import nifty_collections
 from python_toolbox import context_management
 
 from python_toolbox.cute_iter_tools import iter_with
@@ -37,4 +38,19 @@ def test():
         assert inactive_context_manager.counter == -1
         assert inactive_context_manager.active is False
         
-    
+    def test_lazy_tuple():
+    
+    active_context_manager = MyContextManager()
+    inactive_context_manager = MyContextManager()
+    
+    lazy_tuple = iter_with(range(5), active_context_manager, lazy_tuple=True)
+    assert isinstance(lazy_tuple, nifty_collections.LazyTuple)
+    assert not lazy_tuple.collected_data
+    
+    for i, j in zip(lazy_tuple, range(5)):
+        assert i == j == active_context_manager.counter
+        assert active_context_manager.active is False
+        assert inactive_context_manager.counter == -1
+        assert inactive_context_manager.active is False
+        
+    assert lazy_tuple[2] == 2
diff --git a/source_py2/test_python_toolbox/test_cute_iter_tools/test_iterate_overlapping_subsequences.py b/source_py2/test_python_toolbox/test_cute_iter_tools/test_iterate_overlapping_subsequences.py
@@ -4,6 +4,7 @@
 '''Testing module for `cute_iter_tools.iterate_overlapping_subsequences`.'''
 
 from python_toolbox import gc_tools
+from python_toolbox import nifty_collections
 from python_toolbox import cute_testing
 from python_toolbox import sequence_tools
 
@@ -53,6 +54,17 @@ def test_various_lengths():
             (6, 0, 1, 2, 3))
                                           
            
+def test_lazy_tuple():
+    lazy_tuple = \
+          iterate_overlapping_subsequences(range(7), length=3, lazy_tuple=True)
+    assert isinstance(lazy_tuple, nifty_collections.LazyTuple)
+    assert not lazy_tuple.collected_data
+    
+    assert lazy_tuple == \
+                        ((0, 1, 2), (1, 2, 3), (2, 3, 4), (3, 4, 5), (4, 5, 6))
+    
+                                          
+           
 def test_garbage_collection():
     
     garbage_collected = set()
diff --git a/source_py2/test_python_toolbox/test_cute_iter_tools/test_shorten.py b/source_py2/test_python_toolbox/test_cute_iter_tools/test_shorten.py
@@ -5,6 +5,7 @@
 
 import nose.tools
 
+from python_toolbox import nifty_collections
 from python_toolbox import cute_iter_tools
 from python_toolbox.cute_iter_tools import shorten
 
@@ -29,6 +30,16 @@ def test():
     assert list(shorten(iter(my_range), infinity)) == my_range
 
     
+def test_lazy_tuple():
+    my_range = [0, 1, 2, 3, 4]
+
+    lazy_tuple = shorten(my_range, 3, lazy_tuple=True)
+    assert isinstance(lazy_tuple, nifty_collections.LazyTuple)
+    assert not lazy_tuple.collected_data
+    
+    assert tuple(lazy_tuple) == (0, 1, 2)
+    
+    
 def test_dont_pull_extra_item():
     '''Test that `shorten` doesn't pull an extra member from the iterable.'''
     def generator():
diff --git a/source_py2/test_python_toolbox/test_emitting/test_emitter.py b/source_py2/test_python_toolbox/test_emitting/test_emitter.py
@@ -1,3 +1,5 @@
+from python_toolbox import misc_tools
+
 from python_toolbox import emitting
 
 
@@ -7,9 +9,9 @@ def test():
     emitter_2 = emitting.Emitter(inputs=(emitter_1,))
     emitter_0 = emitting.Emitter(outputs=(emitter_1,))
 
+    @misc_tools.set_attributes(call_counter=0)
     def my_function():
         my_function.call_counter += 1
-    my_function.call_counter = 0
     
     emitter_1.add_output(my_function)
     
diff --git a/source_py2/test_python_toolbox/test_misc_tools/test_name_mangling/test_pocket.py b/source_py2/test_python_toolbox/test_misc_tools/test_name_mangling/test_pocket.py
@@ -0,0 +1,19 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+
+from python_toolbox.misc_tools import pocket
+
+
+def test():
+    assert pocket() == None
+    assert pocket() == None
+    assert pocket(7) == None
+    assert pocket() == 7
+    assert pocket() == 7
+    assert pocket(8) == None
+    assert pocket() == 8
+    assert pocket() == 8
+    if pocket(1+1):
+        pass
+    assert pocket() == 2
diff --git a/source_py2/test_python_toolbox/test_sleek_reffing/shared.py b/source_py2/test_python_toolbox/test_sleek_reffing/shared.py
@@ -5,6 +5,9 @@
 
 import weakref
 
+from python_toolbox import misc_tools
+
+
 def _is_weakreffable(thing):
     '''Return whether a weakref can be created to `thing`.'''
     try:
@@ -22,10 +25,10 @@ def s():
         pass
 
     
+@misc_tools.set_attributes(count=0)
 def counter(*args, **kwargs):
     '''Function that returns a higher number every time it's called.'''
-    if not hasattr(counter, 'count'):
-        counter.count = 0
-    result = counter.count
-    counter.count += 1
-    return result
+    try:
+        return counter.count
+    finally:
+        counter.count += 1
diff --git a/source_py2/test_python_toolbox/test_temp_value_setting/test_temp_value_setter.py b/source_py2/test_python_toolbox/test_temp_value_setting/test_temp_value_setter.py
@@ -3,6 +3,7 @@
 
 '''Testing module for `python_toolbox.temp_value_setting.TempValueSetter`.'''
 
+from python_toolbox import misc_tools
 from python_toolbox import cute_testing
 
 from python_toolbox.temp_value_setting import TempValueSetter
@@ -72,8 +73,9 @@ def test_dict_key():
     
 def test_as_decorator():
     '''Test `TempValueSetter` used as a decorator.'''
+    
+    @misc_tools.set_attributes(x=1)
     def a(): pass
-    a.x = 1
     
     @TempValueSetter((a, 'x'), 2)
     def f():
