-

cool-RR · cool-RR · commit dbb43034d151 · 2014-09-22T02:25:26.000+03:00
diff --git a/source_py2/python_toolbox/combi/perm_space.py b/source_py2/python_toolbox/combi/perm_space.py
@@ -52,7 +52,7 @@ def __call__(cls, *args, **kwargs):
                 _degrees_for_checking=arguments_profile['degrees'],
             )
         else:
-            return super(PermSpaceType, self).__call__(*args, **kwargs)
+            return super(PermSpaceType, cls).__call__(*args, **kwargs)
         
         
 @functools.total_ordering
@@ -283,7 +283,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
         if degrees is None:
             degrees = ()
         if not isinstance(degrees, collections.Iterable):
-            assert isinstance(degrees, int)
+            assert isinstance(degrees, numbers.Integral)
             degrees = (degrees,)
         degrees = \
               sequence_tools.ensure_iterable_is_immutable_sequence(degrees)
@@ -408,7 +408,7 @@ def __getitem__(self, i):
                              slice_=canonical_slice)
         
         else:
-            assert isinstance(i, int)
+            assert isinstance(i, numbers.Integral)
             if i <= -1:
                 i += self.length
             if not (0 <= i < self.length):
diff --git a/source_py2/python_toolbox/cute_iter_tools.py b/source_py2/python_toolbox/cute_iter_tools.py
@@ -414,8 +414,8 @@ def are_equal(*sequences):
         # return logic_tools.all_equal(sequences.start for sequence in sequences)
     
     # If cheap comparison didn't work, trying item-by-item comparison:
-    zipped = itertools.zip_longest(*sequences,
-                                   fillvalue=_EMPTY_SENTINEL)
+    zipped = itertools.izip_longest(*sequences,
+                                    fillvalue=_EMPTY_SENTINEL)
     for values in zipped:
         # No need to explicitly check for `_EMPTY_SENTINEL`, it would just make
         # the following condition `False`, because it's impossible for all
diff --git a/source_py2/test_python_toolbox/test_combi/test_selection_space.py b/source_py2/test_python_toolbox/test_combi/test_selection_space.py
@@ -19,7 +19,7 @@ def test():
     assert 7 not in selection_space
     assert (1, 3, 4) in selection_space
     assert selection_space
-    assert repr(selection_space) == '<SelectionSpace: range(0, 5)>'
+    assert repr(selection_space) == '<SelectionSpace: (0, 1, 2, 3, 4)>'
     assert {SelectionSpace(range(4)), SelectionSpace(range(4)),
             SelectionSpace(range(5)), SelectionSpace(range(4))} == \
                            {SelectionSpace(range(4)), SelectionSpace(range(5))}
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -283,7 +283,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
         if degrees is None:
             degrees = ()
         if not isinstance(degrees, collections.Iterable):
-            assert isinstance(degrees, int)
+            assert isinstance(degrees, numbers.Integral)
             degrees = (degrees,)
         degrees = \
               sequence_tools.ensure_iterable_is_immutable_sequence(degrees)
@@ -408,7 +408,7 @@ def __getitem__(self, i):
                              slice_=canonical_slice)
         
         else:
-            assert isinstance(i, int)
+            assert isinstance(i, numbers.Integral)
             if i <= -1:
                 i += self.length
             if not (0 <= i < self.length):
