Get collections ABCs from collections.abc

cool-RR · cool-RR · commit 258e0f337109 · 2019-04-27T20:45:05.000+03:00
diff --git a/source_py3/python_toolbox/combi/chain_space.py b/source_py3/python_toolbox/combi/chain_space.py
@@ -14,7 +14,7 @@
 
 
 
-class ChainSpace(sequence_tools.CuteSequenceMixin, collections.Sequence):
+class ChainSpace(sequence_tools.CuteSequenceMixin, collections.abc.Sequence):
     '''
     A space of sequences chained together.
 
diff --git a/source_py3/python_toolbox/combi/map_space.py b/source_py3/python_toolbox/combi/map_space.py
@@ -11,7 +11,7 @@
 
 
 
-class MapSpace(sequence_tools.CuteSequenceMixin, collections.Sequence):
+class MapSpace(sequence_tools.CuteSequenceMixin, collections.abc.Sequence):
     '''
     A space of a function applied to a sequence.
 
diff --git a/source_py3/python_toolbox/combi/perming/perm.py b/source_py3/python_toolbox/combi/perming/perm.py
@@ -31,7 +31,7 @@ def __getitem__(self, i): pass
 
 
 class PermItems(sequence_tools.CuteSequenceMixin, _BasePermView,
-                collections.Sequence):
+                collections.abc.Sequence):
     '''
     A viewer of a perm's items, similar to `dict.items()`.
 
@@ -46,7 +46,7 @@ def __getitem__(self, i):
 
 
 class PermAsDictoid(sequence_tools.CuteSequenceMixin, _BasePermView,
-                    collections.Mapping):
+                    collections.abc.Mapping):
     '''A dict-like interface to a `Perm`.'''
     def __getitem__(self, key):
         return self.perm[key]
@@ -69,7 +69,7 @@ def __call__(cls, item, perm_space=None):
 
 
 @functools.total_ordering
-class Perm(sequence_tools.CuteSequenceMixin, collections.Sequence,
+class Perm(sequence_tools.CuteSequenceMixin, collections.abc.Sequence,
            metaclass=PermType):
     '''
     A permutation of items from a `PermSpace`.
diff --git a/source_py3/python_toolbox/combi/perming/perm_space.py b/source_py3/python_toolbox/combi/perming/perm_space.py
@@ -59,7 +59,7 @@ def __call__(cls, *args, **kwargs):
 
 class PermSpace(_VariationRemovingMixin, _VariationAddingMixin,
                 _FixedMapManagingMixin, sequence_tools.CuteSequenceMixin,
-                collections.Sequence, metaclass=PermSpaceType):
+                collections.abc.Sequence, metaclass=PermSpaceType):
     '''
     A space of permutations on a sequence.
 
diff --git a/source_py3/python_toolbox/combi/product_space.py b/source_py3/python_toolbox/combi/product_space.py
@@ -7,7 +7,7 @@
 from python_toolbox import sequence_tools
 
 
-class ProductSpace(sequence_tools.CuteSequenceMixin, collections.Sequence):
+class ProductSpace(sequence_tools.CuteSequenceMixin, collections.abc.Sequence):
     '''
     A product space between sequences.
 
@@ -70,7 +70,7 @@ def __getitem__(self, i):
 
     def index(self, given_sequence):
         '''Get the index number of `given_sequence` in this product space.'''
-        if not isinstance(given_sequence, collections.Sequence) or \
+        if not isinstance(given_sequence, collections.abc.Sequence) or \
                                 not len(given_sequence) == len(self.sequences):
             raise ValueError
 
diff --git a/source_py3/python_toolbox/combi/selection_space.py b/source_py3/python_toolbox/combi/selection_space.py
@@ -7,7 +7,7 @@
 
 
 class SelectionSpace(sequence_tools.CuteSequenceMixin,
-                     collections.Sequence):
+                     collections.abc.Sequence):
     '''
     Space of possible selections of any number of items from `sequence`.
 
diff --git a/source_py3/python_toolbox/logic_tools.py b/source_py3/python_toolbox/logic_tools.py
@@ -105,7 +105,7 @@ def get_equivalence_classes(iterable, key=None, container=set, *,
     ### Pre-processing input: #################################################
     #                                                                         #
     if key is None:
-        if isinstance(iterable, collections.Mapping):
+        if isinstance(iterable, collections.abc.Mapping):
             d = iterable
         else:
             try:
diff --git a/source_py3/python_toolbox/nifty_collections/abstract.py b/source_py3/python_toolbox/nifty_collections/abstract.py
@@ -20,7 +20,7 @@ class Ordered(metaclass=abc.ABCMeta):
     __slots__ = ()
 
 
-Ordered.register(collections.Sequence)
+Ordered.register(collections.abc.Sequence)
 Ordered.register(collections.OrderedDict)
 Ordered.register(collections.deque)
 Ordered.register(queue.Queue)
diff --git a/source_py3/python_toolbox/nifty_collections/bagging.py b/source_py3/python_toolbox/nifty_collections/bagging.py
@@ -148,7 +148,7 @@ class _BaseBagMixin:
     def __init__(self, iterable={}):
         super().__init__()
 
-        if isinstance(iterable, collections.Mapping):
+        if isinstance(iterable, collections.abc.Mapping):
             for key, value, in iterable.items():
                 try:
                     self._dict[key] = _process_count(value)
diff --git a/source_py3/python_toolbox/nifty_collections/lazy_tuple.py b/source_py3/python_toolbox/nifty_collections/lazy_tuple.py
@@ -45,7 +45,7 @@ def _with_lock(method, *args, **kwargs):
 
 
 @functools.total_ordering
-class LazyTuple(collections.Sequence):
+class LazyTuple(collections.abc.Sequence):
     '''
     A lazy tuple which requests as few values as possible from its iterator.
 
@@ -75,8 +75,8 @@ def my_generator():
     '''
 
     def __init__(self, iterable, definitely_infinite=False):
-        was_given_a_sequence = isinstance(iterable, collections.Sequence) and \
-                               not isinstance(iterable, LazyTuple)
+        was_given_a_sequence = isinstance(iterable, collections.abc.Sequence) \
+                                        and not isinstance(iterable, LazyTuple)
 
         self.is_exhausted = True if was_given_a_sequence else False
         '''Flag saying whether the internal iterator is tobag exhausted.'''
diff --git a/source_py3/python_toolbox/nifty_collections/various_frozen_dicts.py b/source_py3/python_toolbox/nifty_collections/various_frozen_dicts.py
@@ -10,7 +10,7 @@
 from .ordered_dict import OrderedDict
 
 
-class _AbstractFrozenDict(collections.Mapping):
+class _AbstractFrozenDict(collections.abc.Mapping):
     _hash = None # Overridden by instance when calculating hash.
 
     def __init__(self, *args, **kwargs):
@@ -70,9 +70,9 @@ class FrozenOrderedDict(Ordered, _AbstractFrozenDict):
 
     def __eq__(self, other):
         if isinstance(other, (OrderedDict, FrozenOrderedDict)):
-            return collections.Mapping.__eq__(self, other) and \
+            return collections.abc.Mapping.__eq__(self, other) and \
                                              all(map(operator.eq, self, other))
-        return collections.Mapping.__eq__(self, other)
+        return collections.abc.Mapping.__eq__(self, other)
 
     __hash__ = _AbstractFrozenDict.__hash__
     # (Gotta manually carry `__hash__` over from the base class because setting
diff --git a/source_py3/python_toolbox/nifty_collections/various_ordered_sets.py b/source_py3/python_toolbox/nifty_collections/various_ordered_sets.py
@@ -15,7 +15,7 @@
 KEY, PREV, NEXT = range(3)
 
 
-class BaseOrderedSet(collections.Set, collections.Sequence):
+class BaseOrderedSet(collections.abc.Set, collections.abc.Sequence):
     '''
     Base class for `OrderedSet` and `FrozenOrderedSet`, i.e. set with an order.
 
diff --git a/source_py3/python_toolbox/sequence_tools/canonical_slice.py b/source_py3/python_toolbox/sequence_tools/canonical_slice.py
@@ -47,7 +47,7 @@ def __init__(self, slice_, iterable_or_length=None, offset=0):
             if isinstance(iterable_or_length,
                           math_tools.PossiblyInfiniteIntegral):
                 self.length = iterable_or_length
-            elif isinstance(iterable_or_length, collections.Sequence):
+            elif isinstance(iterable_or_length, collections.abc.Sequence):
                 self.length = sequence_tools.get_length(iterable_or_length)
             else:
                 assert isinstance(iterable_or_length, collections.Iterable)
diff --git a/source_py3/python_toolbox/sequence_tools/misc.py b/source_py3/python_toolbox/sequence_tools/misc.py
@@ -155,8 +155,8 @@ def partitions(sequence, partition_size=None, *, n_partitions=None,
 
 def is_immutable_sequence(thing):
     '''Is `thing` an immutable sequence, like `tuple`?'''
-    return isinstance(thing, collections.Sequence) and not \
-                                 isinstance(thing, collections.MutableSequence)
+    return isinstance(thing, collections.abc.Sequence) and not \
+                             isinstance(thing, collections.abc.MutableSequence)
 
 
 
@@ -192,7 +192,7 @@ def to_tuple(single_or_sequence, item_type=None, item_test=None):
         actual_item_test = None
 
     if actual_item_test is None:
-        if isinstance(single_or_sequence, collections.Sequence):
+        if isinstance(single_or_sequence, collections.abc.Sequence):
             return tuple(single_or_sequence)
         elif single_or_sequence is None:
             return tuple()
@@ -245,9 +245,9 @@ def ensure_iterable_is_immutable_sequence(iterable, default_type=tuple,
     if not allow_unordered and \
                    isinstance(iterable, nifty_collections.DefinitelyUnordered):
         raise UnorderedIterableException
-    if isinstance(iterable, collections.MutableSequence) or \
+    if isinstance(iterable, collections.abc.MutableSequence) or \
        isinstance(iterable, unallowed_types) or \
-       not isinstance(iterable, collections.Sequence):
+       not isinstance(iterable, collections.abc.Sequence):
         return default_type(iterable)
     else:
         return iterable
@@ -266,7 +266,7 @@ def ensure_iterable_is_sequence(iterable, default_type=tuple,
     assert isinstance(iterable, collections.Iterable)
     if not allow_unordered and isinstance(iterable, (set, frozenset)):
         raise UnorderedIterableException
-    if isinstance(iterable, collections.Sequence) and \
+    if isinstance(iterable, collections.abc.Sequence) and \
        not isinstance(iterable, unallowed_types):
         return iterable
     else:
@@ -285,7 +285,7 @@ def __contains__(self, item):
 
 
 
-class CuteSequence(CuteSequenceMixin, collections.Sequence):
+class CuteSequence(CuteSequenceMixin, collections.abc.Sequence):
     '''A sequence type that adds extra functionality.'''
 
 
diff --git a/source_py3/python_toolbox/wx_tools/widgets/cute_window/accelerator_savvy_window.py b/source_py3/python_toolbox/wx_tools/widgets/cute_window/accelerator_savvy_window.py
@@ -43,7 +43,7 @@ def _key_dict_to_accelerators(key_dict):
     ### Breaking down key tuples to individual entries: #######################
     #                                                                         #
     for key, id in original_key_dict.items():
-        if isinstance(key, collections.Sequence):
+        if isinstance(key, collections.abc.Sequence):
             key_sequence = key
             for actual_key in key_sequence:
                 key_dict[actual_key] = id
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
@@ -18,7 +18,7 @@ def test_length_2():
     # `iterate_overlapping_subsequences` returns an iterator, not a sequence:
     assert not isinstance(
         iterate_overlapping_subsequences(list(range(4))),
-        collections.Sequence
+        collections.abc.Sequence
     )
 
     assert tuple(iterate_overlapping_subsequences(list(range(4)))) == \
