-

cool-RR · cool-RR · commit 295913833a35 · 2014-09-27T17:50:05.000+03:00
diff --git a/source_py3/python_toolbox/caching/decorators.py b/source_py3/python_toolbox/caching/decorators.py
@@ -15,7 +15,6 @@
 from python_toolbox import binary_search
 from python_toolbox import decorator_tools
 from python_toolbox.sleek_reffing import SleekCallArgs
-from python_toolbox.nifty_collections import OrderedDict
 
 infinity = float('inf')
 
@@ -70,6 +69,8 @@ def f(a, b=2):
     # have to go through so much shit. update: probably it will help only for
     # completely argumentless function. so do one for those.
     
+    from python_toolbox.nifty_collections import OrderedDict
+    
     if time_to_keep is not None:
         if max_size != infinity:
             raise NotImplementedError
diff --git a/source_py3/python_toolbox/combi/variations.py b/source_py3/python_toolbox/combi/variations.py
@@ -1,5 +1,3 @@
-import enum
-
 from python_toolbox import cute_iter_tools
 from python_toolbox import nifty_collections
 from python_toolbox import caching
@@ -14,7 +12,7 @@ class UnsupportedVariationCombinationException(Exception):
     make variation classes mostly for this and testing'''
     
 
-class PermSpaceVariation(enum.Enum):
+class PermSpaceVariation(nifty_collections.CuteEnum):
     RAPPLIED = 'rapplied'
     RECURRENT = 'recurrent'
     PARTIAL = 'partial'
@@ -25,8 +23,6 @@ class PermSpaceVariation(enum.Enum):
     SLICED = 'sliced'
     
         
-PermSpaceVariation.index = tuple(PermSpaceVariation).index
-
 variation_clashes = (
     {PermSpaceVariation.DEGREED, PermSpaceVariation.COMBINATION},
     {PermSpaceVariation.DEGREED, PermSpaceVariation.PARTIAL},
@@ -49,11 +45,12 @@ def __repr__(self):
     
         
 class VariationSelection():
-    __new__ = lambda cls, variations: cls._create_from_tuple(tuple(sorted(set(variations))))
-        
-    @caching.cache()
-    def _create_from_tuple(cls, variations):
-        self.variations = 1 / 0
+    __new__ = lambda cls, variations: cls._create_from_tuple(
+        tuple(sorted(set(variations)))
+    )
+    _create_from_tuple = caching.cache()(lambda self: super().__new__(variations))
+    # This method exsits so we could cache canonically. The `__new__` method
+    # canonicalizes the `variations` argument and we cache according to it.
         
     def __init__(self, variations):
         self.variations = variations
diff --git a/source_py3/test_python_toolbox/test_caching/test_cached_property.py b/source_py3/test_python_toolbox/test_caching/test_cached_property.py
@@ -35,6 +35,23 @@ class A:
     
     assert a2.personality == a1.personality + 1
 
+def test_inheritance():
+    class A:
+        personality = CachedProperty(counting_func)
+    
+    class B(A):
+        pass
+    
+    assert isinstance(B.personality, CachedProperty)
+        
+    b1 = B()
+    assert b1.personality == b1.personality == b1.personality
+    
+    b2 = B()
+    assert b2.personality == b2.personality == b2.personality 
+    
+    assert b2.personality == b1.personality + 1
+
 def test_value():
     '''Test `CachedProperty` when giving a value instead of a getter.'''
     class B:
