-

cool-RR · cool-RR · commit 7557f6cb7eea · 2019-07-18T19:16:28.000+03:00
diff --git a/python_toolbox/combi/perming/perm.py b/python_toolbox/combi/perming/perm.py
@@ -107,7 +107,7 @@ def __init__(self, perm_sequence, perm_space=None):
         '''
         perm_space = None if perm_space is None \
                                               else PermSpace.coerce(perm_space)
-        assert isinstance(perm_sequence, collections.Iterable)
+        assert isinstance(perm_sequence, collections.abc.Iterable)
         perm_sequence = sequence_tools. \
                            ensure_iterable_is_immutable_sequence(perm_sequence)
 
diff --git a/python_toolbox/combi/perming/perm_space.py b/python_toolbox/combi/perming/perm_space.py
@@ -165,7 +165,7 @@ def __init__(self, iterable_or_length, n_elements=None, *, domain=None,
         #                                                                     #
         assert isinstance(
             iterable_or_length,
-            (collections.Iterable, numbers.Integral)
+            (collections.abc.Iterable, numbers.Integral)
         )
         if isinstance(iterable_or_length, numbers.Integral):
             assert iterable_or_length >= 0
@@ -186,7 +186,7 @@ def __init__(self, iterable_or_length, n_elements=None, *, domain=None,
             self.sequence = sequence_tools.CuteRange(iterable_or_length)
             self.sequence_length = iterable_or_length
         else:
-            assert isinstance(iterable_or_length, collections.Iterable)
+            assert isinstance(iterable_or_length, collections.abc.Iterable)
             self.sequence = sequence_tools. \
                       ensure_iterable_is_immutable_sequence(iterable_or_length)
             range_candidate = sequence_tools.CuteRange(len(self.sequence))
@@ -753,7 +753,7 @@ def __getitem__(self, i):
 
     def index(self, perm):
         '''Get the index number of permutation `perm` in this space.'''
-        if not isinstance(perm, collections.Iterable):
+        if not isinstance(perm, collections.abc.Iterable):
             raise ValueError
 
         try:
diff --git a/python_toolbox/combi/selection_space.py b/python_toolbox/combi/selection_space.py
@@ -74,7 +74,7 @@ def __getitem__(self, i):
 
     def index(self, selection):
         '''Find the index number of `selection` in this `SelectionSpace`.'''
-        if not isinstance(selection, collections.Iterable):
+        if not isinstance(selection, collections.abc.Iterable):
             raise ValueError
 
         selection_set = set(selection)
diff --git a/python_toolbox/dict_tools.py b/python_toolbox/dict_tools.py
@@ -118,7 +118,7 @@ def remove_keys(d, keys_to_remove):
 
     If key doesn't exist, doesn't raise an exception.
     '''
-    if isinstance(keys_to_remove, collections.Iterable):
+    if isinstance(keys_to_remove, collections.abc.Iterable):
         for key in keys_to_remove:
             try:
                 del d[key]
diff --git a/python_toolbox/math_tools/factorials.py b/python_toolbox/math_tools/factorials.py
@@ -76,7 +76,7 @@ def from_factoradic(factoradic_number):
 
     '''
     from python_toolbox import sequence_tools
-    assert isinstance(factoradic_number, collections.Iterable)
+    assert isinstance(factoradic_number, collections.abc.Iterable)
     factoradic_number = \
               sequence_tools.ensure_iterable_is_sequence(factoradic_number)
     number = 0
diff --git a/python_toolbox/nifty_collections/bagging.py b/python_toolbox/nifty_collections/bagging.py
@@ -824,7 +824,7 @@ def get_contained_bags(self):
 
 
 
-class _BaseDictDelegator(collections.MutableMapping):
+class _BaseDictDelegator(collections.abc.MutableMapping):
     '''
     Base class for a dict-like object.
 
diff --git a/python_toolbox/nifty_collections/weak_key_default_dict.py b/python_toolbox/nifty_collections/weak_key_default_dict.py
@@ -13,7 +13,7 @@
 
 
 #todo: needs testing
-class WeakKeyDefaultDict(collections.MutableMapping):
+class WeakKeyDefaultDict(collections.abc.MutableMapping):
     '''
     A weak key dictionary which can use a default factory.
 
diff --git a/python_toolbox/nifty_collections/weak_key_identity_dict.py b/python_toolbox/nifty_collections/weak_key_identity_dict.py
@@ -27,7 +27,7 @@ def __hash__(self):
         return self._hash
 
 
-class WeakKeyIdentityDict(collections.MutableMapping):
+class WeakKeyIdentityDict(collections.abc.MutableMapping):
     """
     A weak key dictionary which cares about the keys' identities.
 
diff --git a/python_toolbox/sequence_tools/canonical_slice.py b/python_toolbox/sequence_tools/canonical_slice.py
@@ -50,7 +50,7 @@ def __init__(self, slice_, iterable_or_length=None, offset=0):
             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)
+                assert isinstance(iterable_or_length, collections.abc.Iterable)
                 self.length = cute_iter_tools.get_length(iterable_or_length)
         else:
             self.length = None
diff --git a/python_toolbox/sequence_tools/misc.py b/python_toolbox/sequence_tools/misc.py
@@ -241,7 +241,7 @@ def ensure_iterable_is_immutable_sequence(iterable, default_type=tuple,
     specified in `default_type`.
     '''
     from python_toolbox import nifty_collections
-    assert isinstance(iterable, collections.Iterable)
+    assert isinstance(iterable, collections.abc.Iterable)
     if not allow_unordered and \
                    isinstance(iterable, nifty_collections.DefinitelyUnordered):
         raise UnorderedIterableException
@@ -263,7 +263,7 @@ def ensure_iterable_is_sequence(iterable, default_type=tuple,
     makes it into a `tuple`, or into any other data type specified in
     `default_type`.
     '''
-    assert isinstance(iterable, collections.Iterable)
+    assert isinstance(iterable, collections.abc.Iterable)
     if not allow_unordered and isinstance(iterable, (set, frozenset)):
         raise UnorderedIterableException
     if isinstance(iterable, collections.abc.Sequence) and \
diff --git a/test_python_toolbox/test_combi/test_extensive.py b/test_python_toolbox/test_combi/test_extensive.py
@@ -48,7 +48,7 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
                  fixed_map={}, degrees=None, is_combination=False,
                  slice_=None, perm_type=None):
         self.sequence = tuple(iterable_or_length) if \
-            isinstance(iterable_or_length, collections.Iterable) else \
+            isinstance(iterable_or_length, collections.abc.Iterable) else \
                                    sequence_tools.CuteRange(iterable_or_length)
         self.sequence_length = len(self.sequence)
         self._sequence_frozen_bag = \
