Merge pull request #141 from juligreen/master

Replace collections.Iterable with collections.abc.Iterable

Author: bastibe

soundcard/coreaudio.py

@@ -465,7 +465,7 @@ def __init__(self, iotype, device, samplerate, channels, blocksize):
                             .format(self.blocksizerange[0],
                                     maxblocksize))
 
-        if isinstance(channels, collections.Iterable):
+        if isinstance(channels, collections.abc.Iterable):
             if iotype == 'output':
                 # invert channel map and fill with -1 ([2, 0] -> [1, -1, 0]):
                 self.channels = len([c for c in channels if c >= 0])

soundcard/mediafoundation.py

@@ -487,7 +487,7 @@ def __init__(self, ptr, samplerate, channels, blocksize, isloopback, exclusive_m
 
         if isinstance(channels, int):
             self.channelmap = list(range(channels))
-        elif isinstance(channels, collections.Iterable):
+        elif isinstance(channels, collections.abc.Iterable):
             self.channelmap = channels
         else:
             raise TypeError('channels must be iterable or integer')

soundcard/pulseaudio.py

@@ -639,7 +639,7 @@ def __enter__(self):
         samplespec = _ffi.new("pa_sample_spec*")
         samplespec.format = _pa.PA_SAMPLE_FLOAT32LE
         samplespec.rate = self._samplerate
-        if isinstance(self.channels, collections.Iterable):
+        if isinstance(self.channels, collections.abc.Iterable):
             samplespec.channels = len(self.channels)
         elif isinstance(self.channels, int):
             samplespec.channels = self.channels
@@ -652,7 +652,7 @@ def __enter__(self):
         # names to avoid garbage collection trouble on the Python/C boundary
         pam = _ffi.new("pa_channel_map*")
         channelmap = _pa.pa_channel_map_init_auto(pam, samplespec.channels, _pa.PA_CHANNEL_MAP_DEFAULT)
-        if isinstance(self.channels, collections.Iterable):
+        if isinstance(self.channels, collections.abc.Iterable):
             for idx, ch in enumerate(self.channels):
                 channelmap.map[idx] = ch+1
         if not _pa.pa_channel_map_valid(channelmap):