-

cool-RR · cool-RR · commit 20b8758c8a11 · 2014-09-22T02:10:07.000+03:00
diff --git a/source_py2/python_toolbox/combi/perm.py b/source_py2/python_toolbox/combi/perm.py
@@ -53,8 +53,9 @@ def __call__(cls, item, perm_space=None):
         
 
 @functools.total_ordering
-class Perm(sequence_tools.CuteSequenceMixin, collections.Sequence,
-           metaclass=PermType):
+class Perm(sequence_tools.CuteSequenceMixin, collections.Sequence):
+    
+    __metaclass__ = PermType    
     
     @classmethod
     def coerce(cls, item, perm_space=None):
diff --git a/source_py2/python_toolbox/combi/perm_space.py b/source_py2/python_toolbox/combi/perm_space.py
@@ -56,8 +56,7 @@ def __call__(cls, *args, **kwargs):
         
         
 @functools.total_ordering
-class PermSpace(sequence_tools.CuteSequenceMixin, collections.Sequence,
-                metaclass=PermSpaceType):
+class PermSpace(sequence_tools.CuteSequenceMixin, collections.Sequence)
     '''
     A space of permutations on a sequence.
     
@@ -109,6 +108,7 @@ class PermSpace(sequence_tools.CuteSequenceMixin, collections.Sequence,
     
     Some clarification  on terminology <blocktododoc> rapplied, dapplied "just" etc.
     '''
+    __metaclass__ = PermSpaceType
     
     @classmethod
     def coerce(cls, argument):
diff --git a/source_py2/python_toolbox/math_tools/types.py b/source_py2/python_toolbox/math_tools/types.py
@@ -12,16 +12,14 @@ class _PossiblyInfiniteIntegralType(abc.ABCMeta):
     # blocktodo: use everywhere in python_toolbox
     def __instancecheck__(self, thing):
         return isinstance(thing, numbers.Integral) or (thing in infinities)
-class PossiblyInfiniteIntegral(numbers.Number,
-                               metaclass=_PossiblyInfiniteIntegralType):
-    pass
+class PossiblyInfiniteIntegral(numbers.Number):
+    __metaclass__ = _PossiblyInfiniteIntegralType
 
 class _PossiblyInfiniteRealType(abc.ABCMeta):
     # blocktodo: use everywhere in python_toolbox
     def __instancecheck__(self, thing):
         return isinstance(thing, numbers.Real) or (thing in infinities)
-class PossiblyInfiniteReal(numbers.Number,
-                           metaclass=_PossiblyInfiniteRealType):
-    pass
+class PossiblyInfiniteReal(numbers.Number):
+    __metaclass__ = _PossiblyInfiniteRealType
 
 
diff --git a/source_py2/python_toolbox/sequence_tools/cute_range.py b/source_py2/python_toolbox/sequence_tools/cute_range.py
@@ -1,5 +1,4 @@
 import abc
-import builtins
 import types
 import collections
 import numbers
@@ -77,7 +76,11 @@ def _is_integral_or_none(thing):
 
 class CuteRangeType(abc.ABCMeta):
     '''Metaclass for `CuteRange`, see its docstring for details.'''
-    def __call__(cls, *args, _avoid_built_in_range=False):
+    def __call__(cls, *args, **kwargs):
+        
+        _avoid_built_in_range = kwargs.pop('_avoid_built_in_range', False)
+        assert not kwargs
+        
         # Our job here is to decide whether to instantiate using the built-in
         # `range` or our kickass `Range`.
         from python_toolbox import math_tools
@@ -107,7 +110,7 @@ def __call__(cls, *args, _avoid_built_in_range=False):
             return super().__call__(*args)
         
 
-class CuteRange(CuteSequence, metaclass=CuteRangeType):
+class CuteRange(CuteSequence):
     '''
     Improved version of Python's `range` that has extra features.
     
@@ -121,6 +124,9 @@ class CuteRange(CuteSequence, metaclass=CuteRangeType):
     
     
     '''
+    
+    __metaclass__ = CuteRangeType
+    
     def __init__(self, *args):
         self.start, self.stop, self.step = parse_range_args(*args)
         
diff --git a/source_py2/python_toolbox/sequence_tools/misc.py b/source_py2/python_toolbox/sequence_tools/misc.py
@@ -67,7 +67,8 @@ def combinations(sequence, n=None, start=0):
         length = len(sequence) - start
         iterators = (combinations(sequence, n=i, start=start) for i
                      in range(1, length + 1))
-        yield from itertools.chain(*iterators)
+        for thing in itertools.chain(*iterators):
+            yield thing
 
     elif n == 1:
         for thing in itertools.islice(sequence, start, None):
