Import Callable from collections.abc (issue #133)

Author: tboggs

spectral/algorithms/transforms.py

@@ -4,7 +4,10 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import collections
+try:
+    from collections.abc import Callable
+except:
+    from collections import Callable
 import numpy as np
 
 
@@ -85,7 +88,7 @@ def __call__(self, X):
         __init__.
         '''
         if not isinstance(X, np.ndarray):
-            if hasattr(X, 'transform') and isinstance(X.transform, collections.Callable):
+            if hasattr(X, 'transform') and isinstance(X.transform, Callable):
                 return X.transform(self)
             else:
                 raise TypeError('Unable to apply transform to object.')

spectral/tests/spytest.py

@@ -4,7 +4,10 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import collections
+try:
+    from collections.abc import Callable
+except:
+    from collections import Callable
 import sys
 
 class SpyTest(object):
@@ -39,7 +42,7 @@ def flush(self):
                 pass
         null = NullStdOut()
         methods = [getattr(self, s) for s in sorted(dir(self)) if s.startswith('test_')]
-        methods = [m for m in methods if isinstance(m, collections.Callable)]
+        methods = [m for m in methods if isinstance(m, Callable)]
         stdout = sys.stdout
         for method in methods:
             print(format('Testing ' + method.__name__.split('_', 1)[-1],