Merge pull request #60 from kiranshila/py38-dev

Fix references to deprecated collections classes

Author: jkocz

src/casperfpga.py

@@ -4,7 +4,7 @@
 import socket
 from time import strptime
 import string
-import collections
+from collections.abc import Callable
 
 from . import register
 from . import sbram
@@ -625,7 +625,7 @@ def _create_memory_devices(self, device_dict, memorymap_dict, legacy_reg_map=Tru
             except KeyError:
                 pass
             else:
-                if not isinstance(known_device_class, collections.Callable):
+                if not isinstance(known_device_class, Callable):
                     raise TypeError('%s is not a callable Memory class - '
                                     'that\'s a problem.' % known_device_class)
 
@@ -692,7 +692,7 @@ def _create_casper_adc_devices(self, device_dict, initialise=False, **kwargs):
             except KeyError:
                 pass
             else:
-                if not isinstance(known_device_class, collections.Callable):
+                if not isinstance(known_device_class, Callable):
                     errmsg = '{} is not a callable ADC Class'.format(known_device_class)
                     raise TypeError(errmsg)
 

src/i2c/i2c_sn.py

@@ -1,5 +1,6 @@
 import numpy as np, logging, time, struct
-import collections,crcmod
+import crcmod
+from collections.abc import Iterable
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +32,7 @@ def write(self,reg=None,data=None):
     def crc8(self,data,poly=0x131,initVal=0):
 
         crc = initVal
-        if isinstance(data,collections.Iterable):
+        if isinstance(data, Iterable):
             for d in data:
                 crc = self.crc8(d,poly,crc)
             return crc

src/i2c_sn.py

@@ -1,5 +1,6 @@
 import numpy as np, logging, time, struct
-import collections,crcmod
+import crcmod
+from collections.abc import Iterable
 
 logger = logging.getLogger(__name__)
 
@@ -33,7 +34,7 @@ def write(self,reg=None,data=None):
     def crc8(self,data,poly=0x131,initVal=0):
 
         crc = initVal
-        if isinstance(data,collections.Iterable):
+        if isinstance(data, Iterable):
             for d in data:
                 crc = self.crc8(d,poly,crc)
             return crc