-

cool-RR · cool-RR · commit 0c043d3c2b1f · 2014-09-18T01:56:29.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -147,7 +147,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
         #                                                                     #
         if iterable_or_length == infinity:
             self.is_rapplied = False
-            self.sequence = cute_iter_tools.CuteCount()
+            self.sequence = sequence_tools.CuteRange(infinity)
             self.sequence_length = infinity
             assert not fixed_map
         elif isinstance(iterable_or_length, numbers.Integral):
@@ -158,7 +158,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
             assert isinstance(iterable_or_length, collections.Iterable)
             self.sequence = sequence_tools. \
                       ensure_iterable_is_immutable_sequence(iterable_or_length)
-            if isinstance(self.sequence, cute_iter_tools.CuteCount):
+            if cute_iter_tools.get_length(self.sequence) == infinity:
                 self.is_rapplied = False
                 self.sequence_length = infinity
             else:
@@ -191,10 +191,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
             raise NotImplementedError
         self.is_partial = (self.n_elements < self.sequence_length)
         
-        self.indices = (range(self.n_elements) if
-                        self.n_elements < infinity else
-                        cute_iter_tools.CuteCount())
-        
+        self.indices = sequence_tools.CuteRange(self.n_elements) 
         
         #                                                                     #
         ### Finished figuring out number of elements. #########################
@@ -299,9 +296,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
         
         ### Figuring out degrees: #############################################
         #                                                                     #
-        all_degrees = cute_iter_tools.CuteCount() if \
-                                        self.sequence_length == infinity else \
-                                                    range(self.sequence_length)
+        all_degrees = sequence_tools.CuteRange(self.sequence_length)
         if degrees is None:
             degrees = ()
         if not isinstance(degrees, collections.Iterable):
@@ -322,7 +317,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
             self.degrees = tuple(
                 degree for degree in degrees if degree in all_degrees
             )
-            if isinstance(self.degrees, cute_iter_tools.CuteCount):
+            if sequence_tools.get_length(self.degrees) == infinity:
                 self._unsliced_length = infinity
             else:
                 
diff --git a/source_py3/python_toolbox/cute_iter_tools.py b/source_py3/python_toolbox/cute_iter_tools.py
@@ -402,8 +402,9 @@ def are_equal(*sequences):
                           get_single_if_any(sequence_types), collections.Sequence):
             
             return logic_tools.all_equal(sequences)
-    if sequence_types == {CuteCount}: # Hack around Pypy bug 1799, remove
-        return logic_tools.all_equal(sequences.start for sequence in sequences)
+    # blocktodo: test on pypy and hopefully remove these two lines if not needed
+    # if sequence_types == {CuteCount}: # Hack around Pypy bug 1799, remove
+        # 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,
