-

cool-RR · cool-RR · commit 61b35eec9cf0 · 2014-10-21T23:30:46.000+03:00
diff --git a/source_py2/python_toolbox/combi/perming/variations.py b/source_py2/python_toolbox/combi/perming/variations.py
@@ -28,9 +28,8 @@ class Variation(nifty_collections.CuteEnum):
     DEGREED = 'degreed'
     SLICED = 'sliced'
     TYPED = 'typed'
-Variation.values = (Variation.RAPPLIED, Variation.RECURRENT, Variation.PARTIAL,
-                    Variation.COMBINATION, Variation.DAPPLIED, Variation.FIXED,
-                    Variation.DEGREED, Variation.SLICED, Variation.TYPED)    
+    __order__ = ('RAPPLIED RECURRENT PARTIAL COMBINATION DAPPLIED FIXED '
+                 'DEGREED SLICED TYPED')
         
 
 class UnallowedVariationSelectionException(exceptions.CuteException):
diff --git a/source_py2/python_toolbox/nifty_collections/cute_enum.py b/source_py2/python_toolbox/nifty_collections/cute_enum.py
@@ -15,11 +15,12 @@
 
 class EnumType(enum.EnumMeta):
     '''Metaclass for our kickass enum type.'''
-    __getitem__ = lambda self, i: self.values[i]
+    __getitem__ = lambda self, i: self._values_tuple[i]
     # This `__getitem__` is important, so we could feed enum types straight
     # into `ProductSpace`.
     
-    __iter__ = lambda self: iter(self.values)
+    _values_tuple = caching.CachedProperty(tuple)
+    
         
     
 @functools.total_ordering
@@ -33,7 +34,7 @@ class _OrderableEnumMixin(object):
     doesn't override them.
     '''
     number = caching.CachedProperty(
-        lambda self: type(self).values.index(self)
+        lambda self: type(self)._values_tuple.index(self)
     )
     __lt__ = lambda self, other: isinstance(other, CuteEnum) and \
                                                    (self.number < other.number)
@@ -43,10 +44,10 @@ class CuteEnum(_OrderableEnumMixin, enum.Enum):
     '''
     An improved version of Python's builtin `enum.Enum` type.
     
-    Note that on Python 2, you must include a line like this after every Enum
+    Note that on Python 2, you must include a line like this in your enum
     definition:
     
-        Flavor.values = (CHOCOLATE, VANILLA, RASPBERRY, BANANA)
+        __order__ = 'CHOCOLATE VANILLA RASPBERRY BANANA'
 
     This defines the order of elements. (On Python 3 you don't have to do this
     because Python 3 can figure out the order by itself.)
diff --git a/source_py2/test_python_toolbox/test_combi/test_extensive.py b/source_py2/test_python_toolbox/test_combi/test_extensive.py
@@ -155,7 +155,7 @@ def _check_variation_selection(variation_selection, perm_space_type,
                                degrees, slice_, perm_type):
     assert isinstance(variation_selection,
                       combi.perming.variations.VariationSelection)
-    return  #blocktodo remove
+    # return  #blocktodo remove
     print(variation_selection.number) #blocktodo remove
     
     kwargs = {}
diff --git a/source_py2/test_python_toolbox/test_combi/test_perm_space.py b/source_py2/test_python_toolbox/test_combi/test_perm_space.py
@@ -618,7 +618,7 @@ class Suit(nifty_collections.CuteEnum):
         diamond = 'diamond'
         heart = 'heart'
         spade = 'spade'
-    Suit.values = (Suit.club, Suit.diamond, Suit.heart, Suit.spade)
+        __order__ = 'club diamond heart spade'
     
     @functools.total_ordering
     class Card():
diff --git a/source_py2/test_python_toolbox/test_nifty_collections/test_cute_enum/test.py b/source_py2/test_python_toolbox/test_nifty_collections/test_cute_enum/test.py
@@ -12,9 +12,7 @@ class Flavor(CuteEnum):
         VANILLA = 'vanilla'
         RASPBERRY = 'raspberry'
         BANANA = 'banana'
-        
-    Flavor.values = (Flavor.CHOCOLATE, Flavor.VANILLA, Flavor.RASPBERRY,
-                     Flavor.BANANA)
+        __order__ = 'CHOCOLATE VANILLA RASPBERRY BANANA'
         
     assert tuple(Flavor) == (Flavor.CHOCOLATE, Flavor.VANILLA,
                              Flavor.RASPBERRY, Flavor.BANANA)
