-

cool-RR · cool-RR · commit bdd42e05f39e · 2014-10-21T21:16:14.000+03:00
diff --git a/source_py2/python_toolbox/combi/perming/perm.py b/source_py2/python_toolbox/combi/perming/perm.py
@@ -431,7 +431,7 @@ class UnrecurrentedMixin(object):
     '''Mixin for a permutation in a space that's been unrecurrented.'''
     def __getitem__(self, i):
         return super(UnrecurrentedMixin, self).__getitem__(i)[1]
-    def __iter__(self, i):
+    def __iter__(self):
         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)
diff --git a/source_py2/python_toolbox/nifty_collections/cute_enum.py b/source_py2/python_toolbox/nifty_collections/cute_enum.py
@@ -11,7 +11,7 @@ class EnumType(enum.EnumMeta):
     '''Metaclass for our kickass enum type.'''
     def __dir__(cls):
         # working around Python bug 22506 that would be fixed in Python 3.5.
-        return type.__dir__(cls) + cls._member_names_
+        return object.__dir__(cls) + cls._member_names_
     
     __getitem__ = lambda self, i: self._values_tuple[i]
     # This `__getitem__` is important, so we could feed enum types straight
diff --git a/source_py2/test_python_toolbox/test_combi/test_extensive.py b/source_py2/test_python_toolbox/test_combi/test_extensive.py
@@ -26,7 +26,8 @@ class _NO_ARGUMENT_TYPE(type):
     __repr__ = lambda cls: '<%s>' % cls.__name__
         
 
-class NO_ARGUMENT(metaclass=_NO_ARGUMENT_TYPE): pass
+class NO_ARGUMENT(object):
+    __metaclass__ = _NO_ARGUMENT_TYPE
         
 
 
diff --git a/source_py2/test_python_toolbox/test_nifty_collections/test_bagging.py b/source_py2/test_python_toolbox/test_nifty_collections/test_bagging.py
@@ -24,7 +24,8 @@
 infinity = float('inf')
 infinities = (infinity, -infinity)
 
-class BaseBagTestCase(cute_testing.TestCase, metaclass=abc.ABCMeta):
+class BaseBagTestCase(cute_testing.TestCase):
+    __metaclass__ = abc.ABCMeta
     __test__ = False
     def test_common(self):
         bag = self.bag_type('abracadabra')
