-

cool-RR · cool-RR · commit 967fcfcbeb72 · 2014-09-27T17:31:39.000+03:00
diff --git a/source_py3/python_toolbox/combi/variations.py b/source_py3/python_toolbox/combi/variations.py
@@ -48,7 +48,13 @@ def __repr__(self):
         return '<VariationSelectionSpace>'
     
         
-class VariationSelection:
+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
+        
     def __init__(self, variations):
         self.variations = variations
         
@@ -68,5 +74,4 @@ def is_allowed(self):
      
 variation_selection_space = VariationSelectionSpace()
 variation_selection_space[7].is_allowed
-repr(variation_selection_space[7])
-2 / 2
+repr(variation_selection_space[7])
diff --git a/source_py3/python_toolbox/comparison_tools.py b/source_py3/python_toolbox/comparison_tools.py
@@ -12,49 +12,6 @@ def underscore_hating_key(string):
     return str(string).replace('_', chr(sys.maxunicode))
 
 
-def total_ordering(cls): 
-    '''
-    Add full arsenal of ordering methods to a class based on existing subset.
-    '''
-    convert = {
-        '__lt__': [('__gt__', lambda self, other:
-                                  not (self < other or self == other)),
-                   ('__le__', lambda self, other:
-                                  self < other or self == other),
-                   ('__ge__', lambda self, other:
-                                  not self < other)],
-        '__le__': [('__ge__', lambda self, other: 
-                                  not self <= other or self == other),
-                   ('__lt__', lambda self, other: 
-                                  self <= other and not self == other),
-                   ('__gt__', lambda self, other: 
-                                  not self <= other)],
-        '__gt__': [('__lt__', lambda self, other: 
-                                  not (self > other or self == other)),
-                   ('__ge__', lambda self, other: 
-                                  self > other or self == other),
-                   ('__le__', lambda self, other: 
-                                  not self > other)],
-        '__ge__': [('__le__', lambda self, other: 
-                                  (not self >= other) or self == other),
-                   ('__gt__', lambda self, other: 
-                                  self >= other and not self == other),
-                   ('__lt__', lambda self, other: 
-                                  not self >= other)]
-    }
-    roots = set(dir(cls)) & set(convert)
-    if not roots:
-        raise ValueError('Must define at least one ordering operation: `<`, '
-                         '`>`, `<=`, or `>=`.')
-    root = max(roots) # We prefer __lt__ to __le__ to __gt__ to __ge__
-    for opname, opfunc in convert[root]:
-        if opname not in roots:
-            opfunc.__name__ = opname
-            opfunc.__doc__ = getattr(float, opname).__doc__
-            setattr(cls, opname, opfunc)
-    return cls
-
-
 def process_key_function_or_attribute_name(key_function_or_attribute_name):
     '''
     Make a key function given either a key function or an attribute name.
diff --git a/source_py3/python_toolbox/nifty_collections/__init__.py b/source_py3/python_toolbox/nifty_collections/__init__.py
@@ -12,6 +12,7 @@
 from .frozen_counter import FrozenCounter
 from .frozen_crate_counter import FrozenCrateCounter
 from .default_sorted_dict import DefaultSortedDict
+from .orderable_enum import OrderableEnum
 
 from .emitting_ordered_set import EmittingOrderedSet
 from .emitting_weak_key_default_dict import EmittingWeakKeyDefaultDict
diff --git a/source_py3/python_toolbox/nifty_collections/lazy_tuple.py b/source_py3/python_toolbox/nifty_collections/lazy_tuple.py
@@ -7,6 +7,7 @@
 See its documentation for more information.
 '''
 
+import functools
 import threading
 import collections
 import itertools
@@ -49,7 +50,7 @@ def _with_lock(method, *args, **kwargs):
 
 
 @collections.Sequence.register
-@comparison_tools.total_ordering    
+@functools.total_ordering    
 class LazyTuple(collections.Sequence):
     '''
     A lazy tuple which requests as few values as possible from its iterator.
diff --git a/source_py3/python_toolbox/nifty_collections/orderable_enum.py b/source_py3/python_toolbox/nifty_collections/orderable_enum.py
@@ -0,0 +1,8 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+import enum
+
+
+class OrderableEnum(enum.Enum):
+    pass
