From 66acac3e35a7ae83338602396bd3d9fbbc0b6895 Mon Sep 17 00:00:00 2001 From: "Jorge A. Duarte" Date: Sun, 15 Oct 2017 13:52:22 -0500 Subject: [PATCH] Made PEP8 changes to several scripts and files. --- amodem/audio.py | 1 + amodem/common.py | 22 ++++++++++------------ amodem/dsp.py | 6 +++--- amodem/levinson.py | 4 ++-- scripts/plot.py | 1 + scripts/resample.py | 1 + 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/amodem/audio.py b/amodem/audio.py index 8fffd02..64cfd91 100644 --- a/amodem/audio.py +++ b/amodem/audio.py @@ -6,6 +6,7 @@ import time log = logging.getLogger(__name__) + class Interface(object): def __init__(self, config, debug=False): self.debug = bool(debug) diff --git a/amodem/common.py b/amodem/common.py index 9243cd0..32a371d 100644 --- a/amodem/common.py +++ b/amodem/common.py @@ -11,29 +11,27 @@ log = logging.getLogger(__name__) scaling = 32000.0 # out of 2**15 -""" -""" def load(fileobj): - ''' Load signal from file object. ''' + """ Load signal from file object. """ return loads(fileobj.read()) def loads(data): - ''' Load signal from memory buffer. ''' + """ Load signal from memory buffer. """ x = np.frombuffer(data, dtype='int16') x = x / scaling return x def dumps(sym): - ''' Dump signal to memory buffer. ''' + """ Dump signal to memory buffer. """ sym = sym.real * scaling return sym.astype('int16').tostring() def iterate(data, size, func=None, truncate=True, index=False): - ''' Iterate over a signal, taking each time *size* elements. ''' + """ Iterate over a signal, taking each time *size* elements. """ offset = 0 data = iter(data) @@ -51,9 +49,9 @@ def iterate(data, size, func=None, truncate=True, index=False): def split(iterable, n): - ''' Split an iterable of n-tuples into n iterables of scalars. + """ Split an iterable of n-tuples into n iterables of scalars. The k-th iterable will be equivalent to (i[k] for i in iter). - ''' + """ def _gen(it, index): for item in it: yield item[index] @@ -63,26 +61,26 @@ def split(iterable, n): def icapture(iterable, result): - ''' Appends each yielded item to result. ''' + """ Appends each yielded item to result. """ for i in iter(iterable): result.append(i) yield i def take(iterable, n): - ''' Take n elements from iterable, and return them as a numpy array. ''' + """ Take n elements from iterable, and return them as a numpy array. """ return np.array(list(itertools.islice(iterable, n))) def izip(iterables): - ''' "Python 3" zip re-implementation for Python 2. ''' + """ "Python 3" zip re-implementation for Python 2. """ iterables = [iter(iterable) for iterable in iterables] while True: yield tuple([next(iterable) for iterable in iterables]) class Dummy(object): - ''' Dummy placeholder object for testing and mocking. ''' + """ Dummy placeholder object for testing and mocking. """ def __getattr__(self, name): return self diff --git a/amodem/dsp.py b/amodem/dsp.py index 7027625..5df72b5 100644 --- a/amodem/dsp.py +++ b/amodem/dsp.py @@ -62,7 +62,7 @@ def coherence(x, omega): def linear_regression(x, y): - ''' Find (a,b) such that y = a*x + b. ''' + """ Find (a,b) such that y = a*x + b. """ x = np.array(x) y = np.array(y) mean_x = np.mean(x) @@ -100,7 +100,7 @@ class MODEM(object): yield self.encode_map[bits_tuple] def decode(self, symbols, error_handler=None): - ''' Maximum-likelihood decoding, using naive nearest-neighbour. ''' + """ Maximum-likelihood decoding, using naive nearest-neighbour. """ symbols_vec = self.symbols _dec = self.decode_list for received in symbols: @@ -113,7 +113,7 @@ class MODEM(object): def prbs(reg, poly, bits): - ''' Simple pseudo-random number generator. ''' + """ Simple pseudo-random number generator. """ mask = (1 << bits) - 1 size = 0 # effective register size (in bits) diff --git a/amodem/levinson.py b/amodem/levinson.py index 5280067..184fd6b 100644 --- a/amodem/levinson.py +++ b/amodem/levinson.py @@ -2,9 +2,9 @@ import numpy as np def solver(t, y): - ''' Solve Mx = y for x, where M[i,j] = t[|i-j|], in O(N^2) steps. + """ Solve Mx = y for x, where M[i,j] = t[|i-j|], in O(N^2) steps. See http://en.wikipedia.org/wiki/Levinson_recursion for details. - ''' + """ N = len(t) assert len(y) == N diff --git a/scripts/plot.py b/scripts/plot.py index fa79227..605deb6 100755 --- a/scripts/plot.py +++ b/scripts/plot.py @@ -34,5 +34,6 @@ def main(): pylab.show() + if __name__ == '__main__': main() diff --git a/scripts/resample.py b/scripts/resample.py index 9ae3873..363839a 100755 --- a/scripts/resample.py +++ b/scripts/resample.py @@ -17,5 +17,6 @@ def main(): resample(src=sys.stdin, dst=sys.stdout, df=args.df) + if __name__ == '__main__': main()