common: enumerate -> index

amodem/common.py

@@ -22,7 +22,7 @@ def dumps(sym):
     return sym.astype('int16').tostring()
 
 
-def iterate(data, size, func=None, truncate=True, enumerate=False):
+def iterate(data, size, func=None, truncate=True, index=False):
     offset = 0
     data = iter(data)
 
@@ -35,7 +35,7 @@ def iterate(data, size, func=None, truncate=True, enumerate=False):
             done = True
 
         result = func(buf) if func else np.array(buf)
-        yield (offset, result) if enumerate else result
+        yield (offset, result) if index else result
         offset += size
 
 

amodem/detect.py

@@ -31,7 +31,7 @@ class Detector(object):
     def run(self, samples):
         counter = 0
         bufs = collections.deque([], maxlen=self.maxlen)
-        for offset, buf in common.iterate(samples, self.Nsym, enumerate=True):
+        for offset, buf in common.iterate(samples, self.Nsym, index=True):
             if offset > self.max_offset:
                 raise ValueError('Timeout waiting for carrier')
             bufs.append(buf)

tests/test_common.py

@@ -6,7 +6,7 @@ def iterlist(x, *args, **kwargs):
     x = np.array(x)
     return list(
         (i, list(x))
-        for i, x in common.iterate(x, enumerate=True, *args, **kwargs)
+        for i, x in common.iterate(x, index=True, *args, **kwargs)
     )