From 5f664e59449a37f5aef94cd53e242cfbdfd3d6ec Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Wed, 31 Dec 2014 12:46:56 +0200 Subject: [PATCH] common: enumerate -> index --- amodem/common.py | 4 ++-- amodem/detect.py | 2 +- tests/test_common.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amodem/common.py b/amodem/common.py index 70788b7..57c2a00 100644 --- a/amodem/common.py +++ b/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 diff --git a/amodem/detect.py b/amodem/detect.py index 9992f60..7c4960f 100644 --- a/amodem/detect.py +++ b/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) diff --git a/tests/test_common.py b/tests/test_common.py index 80647f4..499600e 100644 --- a/tests/test_common.py +++ b/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) )