Fix more abc deprecation

cool-RR · cool-RR · commit 4a83132b5ce5 · 2019-07-18T18:55:23.000+03:00
diff --git a/python_toolbox/combi/perming/perm_space.py b/python_toolbox/combi/perming/perm_space.py
@@ -268,7 +268,7 @@ def __init__(self, iterable_or_length, n_elements=None, *, domain=None,
         if fixed_map is None:
             fixed_map = {}
         if not isinstance(fixed_map, dict):
-            if isinstance(fixed_map, collections.Callable):
+            if isinstance(fixed_map, collections.abc.Callable):
                 fixed_map = {item: fixed_map(item) for item in self.sequence}
             else:
                 fixed_map = dict(fixed_map)
diff --git a/python_toolbox/dict_tools.py b/python_toolbox/dict_tools.py
@@ -128,7 +128,7 @@ def remove_keys(d, keys_to_remove):
         if isinstance(keys_to_remove, collections.abc.Container):
             filter_function = lambda value: value in keys_to_remove
         else:
-            assert isinstance(keys_to_remove, collections.Callable)
+            assert isinstance(keys_to_remove, collections.abc.Callable)
             filter_function = keys_to_remove
         for key in list(d.keys()):
             if filter_function(key):
diff --git a/python_toolbox/emitting/emitter.py b/python_toolbox/emitting/emitter.py
@@ -72,7 +72,7 @@ def __init__(self, inputs=(), outputs=(), name=None):
         inputs = sequence_tools.to_tuple(inputs,
                                          item_type=Emitter)
         outputs = sequence_tools.to_tuple(outputs,
-                                          item_type=(collections.Callable,
+                                          item_type=(collections.abc.Callable,
                                                      Emitter))
 
         self._inputs = set()
@@ -220,15 +220,15 @@ def add_output(self, thing):
         If adding an emitter, every time this emitter will emit the output
         emitter will emit as well.
         '''
-        assert isinstance(thing, (Emitter, collections.Callable))
+        assert isinstance(thing, (Emitter, collections.abc.Callable))
         self._outputs.add(thing)
         if isinstance(thing, Emitter):
             thing._inputs.add(self)
         self._recalculate_total_callable_outputs_recursively()
 
     def remove_output(self, thing):
         '''Remove an output from this emitter.'''
-        assert isinstance(thing, (Emitter, collections.Callable))
+        assert isinstance(thing, (Emitter, collections.abc.Callable))
         self._outputs.remove(thing)
         if isinstance(thing, Emitter):
             thing._inputs.remove(self)
diff --git a/python_toolbox/logic_tools.py b/python_toolbox/logic_tools.py
@@ -137,7 +137,7 @@ def get_equivalence_classes(iterable, key=None, container=set, *,
         new_dict[key] = container(value)
 
     if sort_ordered_dict:
-        if isinstance(sort_ordered_dict, (collections.Callable, str)):
+        if isinstance(sort_ordered_dict, (collections.abc.Callable, str)):
             key_function = comparison_tools. \
                       process_key_function_or_attribute_name(sort_ordered_dict)
             new_dict.sort(key_function)
