-

cool-RR · cool-RR · commit b5f509444084 · 2014-03-07T18:24:08.000+02:00
diff --git a/source_py3/python_toolbox/nifty_collections/lazy_tuple.py b/source_py3/python_toolbox/nifty_collections/lazy_tuple.py
@@ -76,7 +76,7 @@ def my_generator():
     '''
     
     def __init__(self, iterable, definitely_infinite=False):
-        was_given_a_sequence = sequence_tools.is_sequence(iterable) and \
+        was_given_a_sequence = isinstance(iterable, collections.Sequence) and \
                                not isinstance(iterable, LazyTuple)
         
         self.exhausted = True if was_given_a_sequence else False
diff --git a/source_py3/python_toolbox/sequence_tools.py b/source_py3/python_toolbox/sequence_tools.py
@@ -150,20 +150,10 @@ def partitions(sequence, partition_size=None, n_partitions=None,
     return blocks
 
 
-def is_sequence(thing):
-    '''Is `thing` a sequence, like `list` or `tuple`?'''
-    return collections.Sequence.__instancecheck__(thing)
-
-
-def is_mutable_sequence(thing):
-    '''Is `thing` a mutable sequence, like `list`?'''
-    return collections.MutableSequence.__instancecheck__(thing)
-
-
 def is_immutable_sequence(thing):
     '''Is `thing` an immutable sequence, like `tuple`?'''
-    return collections.Sequence.__instancecheck__(thing) and not \
-           collections.MutableSequence.__instancecheck__(thing)
+    return isinstance(thing, collections.Sequence) and not \
+                                 isinstance(thing, collections.MutableSequence)
 
 
 def parse_slice(s):
@@ -251,7 +241,7 @@ def to_tuple(single_or_sequence, item_type=None, item_test=None):
         actual_item_test = None
 
     if actual_item_test is None:
-        if is_sequence(single_or_sequence):
+        if isinstance(single_or_sequence, collections.Sequence):
             return tuple(single_or_sequence)
         else:
             return (single_or_sequence,)
diff --git a/source_py3/test_python_toolbox/test_cute_iter_tools/test_iterate_overlapping_subsequences.py b/source_py3/test_python_toolbox/test_cute_iter_tools/test_iterate_overlapping_subsequences.py
@@ -3,6 +3,8 @@
 
 '''Testing module for `cute_iter_tools.iterate_overlapping_subsequences`.'''
 
+import collections
+
 from python_toolbox import gc_tools
 from python_toolbox import nifty_collections
 from python_toolbox import cute_testing
@@ -14,8 +16,9 @@
 def test_length_2():
     
     # `iterate_overlapping_subsequences` returns an iterator, not a sequence:
-    assert not sequence_tools.is_sequence(
-        iterate_overlapping_subsequences(list(range(4)))
+    assert not isinstance(
+        iterate_overlapping_subsequences(list(range(4))),
+        collections.Sequence
     )
                                           
     assert tuple(iterate_overlapping_subsequences(list(range(4)))) == \
