-

cool-RR · cool-RR · commit 75213b57f4cb · 2014-09-24T02:20:49.000+03:00
diff --git a/source_py2/python_toolbox/combi/perm.py b/source_py2/python_toolbox/combi/perm.py
@@ -309,15 +309,15 @@ def rapply(self, sequence, result_type=None):
         
         permed_generator = (sequence[i] for i in self)
         if result_type is not None:
-            if result_type is str:
+            if result_type in (str, unicode):
                 return ''.join(permed_generator)
             else:
                 return result_type(permed_generator)
         elif isinstance(sequence, Perm):
             return Perm(permed_generator,
                         sequence.just_dapplied_rapplied_perm_space)
-        elif isinstance(sequence, str):
-            return ''.join(permed_generator)
+        elif isinstance(sequence, (str, unicode)):
+            return type(sequence)().join(permed_generator)
         else:
             return tuple(permed_generator)
             
diff --git a/source_py2/python_toolbox/sequence_tools/cute_range.py b/source_py2/python_toolbox/sequence_tools/cute_range.py
@@ -132,6 +132,8 @@ def __init__(self, *args):
         
     _reduced = property(lambda self: (type(self), (self.start, self.stop,
                                                    self.step)))
+    
+    __hash__ = lambda self: hash(self._reduced)
         
     __eq__ = lambda self, other: (isinstance(other, CuteRange) and
                                   (self._reduced == other._reduced))
diff --git a/source_py2/python_toolbox/sequence_tools/misc.py b/source_py2/python_toolbox/sequence_tools/misc.py
@@ -236,7 +236,7 @@ def get_recurrences(sequence):
 
     
 def ensure_iterable_is_immutable_sequence(iterable, default_type=tuple,
-                                          unallowed_types=(bytes,),
+                                          unallowed_types=(),
                                           allow_unordered=True):
     '''
     Return a version of `iterable` that is an immutable sequence.
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
@@ -21,7 +21,7 @@ def test_perm_spaces():
     assert pure_0a == pure_0b == pure_0c == pure_0d
     assert len(pure_0a) == len(pure_0b) == len(pure_0c) == len(pure_0d)
     assert repr(pure_0a) == repr(pure_0b) == repr(pure_0c) == \
-                         repr(pure_0d) == '<PermSpace: range(0, 4)>'
+                                repr(pure_0d) == '<PermSpace: CuteRange(0, 4)>'
     
     assert cute_iter_tools.are_equal(pure_0a, pure_0b, pure_0c, pure_0d)
     
diff --git a/source_py3/python_toolbox/sequence_tools/cute_range.py b/source_py3/python_toolbox/sequence_tools/cute_range.py
@@ -126,6 +126,8 @@ def __init__(self, *args):
         
     _reduced = property(lambda self: (type(self), (self.start, self.stop,
                                                    self.step)))
+    
+    __hash__ = lambda self: hash(self._reduced)
         
     __eq__ = lambda self, other: (isinstance(other, CuteRange) and
                                   (self._reduced == other._reduced))
