-

cool-RR · cool-RR · commit 7460aff34cae · 2014-10-21T00:42:11.000+03:00
diff --git a/source_py2/python_toolbox/combi/perming/perm.py b/source_py2/python_toolbox/combi/perming/perm.py
@@ -429,8 +429,10 @@ def __lt__(self, other):
 
 class UnrecurrentedMixin:
     '''Mixin for a permutation in a space that's been unrecurrented.'''
-    __getitem__ = lambda self, i: super().__getitem__(i)[1]
-    __iter__ = lambda self: iter(tuple(zip(*super().__iter__()))[1])
+    def __getitem__(self, i):
+        return super(UnrecurrentedMixin, self).__getitem__(i)[1]
+    def __iter__(self, i):
+        return iter(tuple(zip(*super(UnrecurrentedMixin, self).__iter__()))[1])
     index = lambda self, item: self.nominal_perm_space.domain[
         next(j for j, pair in enumerate(self._perm_sequence)
                                                             if pair[1] == item)
diff --git a/source_py2/python_toolbox/combi/perming/perm_space.py b/source_py2/python_toolbox/combi/perming/perm_space.py
@@ -940,7 +940,7 @@ def __reduce__(self, *args, **kwargs):
             pass
         #                                                                     #
         #######################################################################
-        return super().__reduce__(*args, **kwargs)
+        return super(PermSpace, self).__reduce__(*args, **kwargs)
         
         
     def _coerce_perm(self, perm):
diff --git a/source_py2/python_toolbox/combi/perming/variations.py b/source_py2/python_toolbox/combi/perming/variations.py
@@ -41,7 +41,7 @@ class UnallowedVariationSelectionException(exceptions.CuteException):
     def __init__(self, variation_clash):
         self.variation_clash = variation_clash
         assert variation_clash in variation_clashes
-        super().__init__(
+        super(UnallowedVariationSelectionException, self).__init__(
             "You can't create a `PermSpace` that's %s." % (
                 ' and '.join(
                     '%s%s' % (
@@ -81,7 +81,9 @@ def __getitem__(self, i):
         return VariationSelection(SelectionSpace.__getitem__(self, i))
         
     def index(self, variation_selection):
-        return super().index(variation_selection.variations)
+        return super(VariationSelectionSpace, self).index(
+            variation_selection.variations
+        )
         
     @caching.cache()
     def __repr__(self):
@@ -142,7 +144,7 @@ def _create_from_sorted_set(cls, variations):
         # This method exsits so we could cache canonically. The `__new__`
         # method canonicalizes the `variations` argument to a `SortedSet` and
         # we cache according to it.
-        variation_selection = super().__new__(cls)
+        variation_selection = super(VariationSelection, cls).__new__(cls)
         variation_selection.__init__(variations)
         return variation_selection
         
diff --git a/source_py2/python_toolbox/nifty_collections/bagging.py b/source_py2/python_toolbox/nifty_collections/bagging.py
@@ -146,7 +146,7 @@ class _BaseBagMixin:
     '''
     
     def __init__(self, iterable={}):
-        super().__init__()
+        super(_BaseBagMixin, self).__init__()
         
         if isinstance(iterable, collections.Mapping):
             for key, value, in iterable.items():
@@ -547,7 +547,7 @@ class _MutableBagMixin(_BaseBagMixin):
     
     def __setitem__(self, i, count):
         try:
-            super().__setitem__(i, _process_count(count))
+            super(_MutableBagMixin, self).__setitem__(i, _process_count(count))
         except _ZeroCountAttempted:
             del self[i]
     
@@ -825,7 +825,8 @@ def get_contained_bags(self):
         key.
         '''
         if self._contained_bags is None:
-            self._contained_bags = super().get_contained_bags()
+            self._contained_bags = \
+                              super(_FrozenBagMixin, self).get_contained_bags()
         return self._contained_bags
         
 
diff --git a/source_py2/python_toolbox/nifty_collections/frozen_bag_bag.py b/source_py2/python_toolbox/nifty_collections/frozen_bag_bag.py
@@ -28,7 +28,7 @@ class FrozenBagBag(FrozenBag):
         
     '''
     def __init__(self, iterable):
-        super().__init__(iterable)
+        super(FrozenBagBag, self).__init__(iterable)
         
         # All zero values were already fileterd out by `FrozenBag`, we'll
         # filter out just the non-natural-number keys.
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
@@ -651,7 +651,8 @@ def __eq__(self, other):
     
     class PokerHandSpace(combi.CombSpace):
         def __init__(self):
-            super().__init__(card_space, 5, perm_type=PokerHand)
+            super(PokerHandSpace, self).__init__(card_space, 5,
+                                                 perm_type=PokerHand)
             
     class PokerHand(combi.Comb):
         @caching.CachedProperty
diff --git a/source_py3/python_toolbox/combi/perming/perm.py b/source_py3/python_toolbox/combi/perming/perm.py
@@ -426,8 +426,10 @@ def __lt__(self, other):
 
 class UnrecurrentedMixin:
     '''Mixin for a permutation in a space that's been unrecurrented.'''
-    __getitem__ = lambda self, i: super().__getitem__(i)[1]
-    __iter__ = lambda self: iter(tuple(zip(*super().__iter__()))[1])
+    def __getitem__(self, i):
+        return super().__getitem__(i)[1]
+    def __iter__(self, i):
+        return iter(tuple(zip(*super().__iter__()))[1])
     index = lambda self, item: self.nominal_perm_space.domain[
         next(j for j, pair in enumerate(self._perm_sequence)
                                                             if pair[1] == item)
