From 5b94d7fd499ed75856af04bb9c515fb3ecc91e01 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 7 Feb 2015 08:42:44 +0200 Subject: [PATCH] PEP8 fixes --- amodem-cli | 5 ++--- amodem/calib.py | 10 +++++----- amodem/config.py | 9 +++++++-- amodem/detect.py | 8 ++++---- amodem/equalizer.py | 6 +++--- amodem/framing.py | 6 ++++-- amodem/recv.py | 10 +++++----- amodem/send.py | 8 ++++---- tests/test_dsp.py | 4 +--- tests/test_transfer.py | 10 ++++------ 10 files changed, 39 insertions(+), 37 deletions(-) diff --git a/amodem-cli b/amodem-cli index 940ceee..56c81c2 100755 --- a/amodem-cli +++ b/amodem-cli @@ -1,5 +1,7 @@ #!/usr/bin/env python # PYTHON_ARGCOMPLETE_OK +from amodem import main, calib, audio, async +from amodem.config import bitrates import os import sys @@ -19,9 +21,6 @@ except ImportError: log = logging.getLogger('__name__') -from amodem import main, calib, audio, async -from amodem.config import bitrates - bitrate = os.environ.get('BITRATE', 1) config = bitrates.get(int(bitrate)) diff --git a/amodem/calib.py b/amodem/calib.py index 44fd784..01a8bab 100644 --- a/amodem/calib.py +++ b/amodem/calib.py @@ -1,3 +1,8 @@ +from . import common +from . import dsp +from . import sampling +from . import stream + import numpy as np import itertools import logging @@ -5,11 +10,6 @@ import subprocess log = logging.getLogger(__name__) -from . import common -from . import dsp -from . import sampling -from . import stream - def volume_controller(cmd): def controller(level): diff --git a/amodem/config.py b/amodem/config.py index 45903a2..d1d6a8c 100644 --- a/amodem/config.py +++ b/amodem/config.py @@ -71,5 +71,10 @@ bitrates = { 80: Configuration(F0=2e3, Npoints=256, Nfreq=10), } -fastest = lambda: bitrates[max(bitrates)] -slowest = lambda: bitrates[min(bitrates)] + +def fastest(): + return bitrates[max(bitrates)] + + +def slowest(): + return bitrates[min(bitrates)] diff --git a/amodem/detect.py b/amodem/detect.py index 006116b..e565a48 100644 --- a/amodem/detect.py +++ b/amodem/detect.py @@ -1,3 +1,7 @@ +from . import dsp +from . import equalizer +from . import common + import numpy as np import logging import itertools @@ -5,10 +9,6 @@ import collections log = logging.getLogger(__name__) -from . import dsp -from . import equalizer -from . import common - class Detector(object): diff --git a/amodem/equalizer.py b/amodem/equalizer.py index c14cef1..d1d5f1b 100644 --- a/amodem/equalizer.py +++ b/amodem/equalizer.py @@ -1,9 +1,9 @@ +from . import dsp +from . import sampling + import numpy as np from numpy.linalg import lstsq -from amodem import dsp -from amodem import sampling - import itertools import random diff --git a/amodem/framing.py b/amodem/framing.py index fc90b6d..d66ad21 100644 --- a/amodem/framing.py +++ b/amodem/framing.py @@ -7,8 +7,10 @@ import struct import logging log = logging.getLogger(__name__) -_checksum_func = lambda x: binascii.crc32(bytes(x)) & 0xFFFFFFFF -# (so the result will be unsigned on Python 2/3) + +def _checksum_func(x): + ''' The result will be unsigned on Python 2/3. ''' + return binascii.crc32(bytes(x)) & 0xFFFFFFFF class Checksum(object): diff --git a/amodem/recv.py b/amodem/recv.py index 4af24f0..45409c4 100644 --- a/amodem/recv.py +++ b/amodem/recv.py @@ -1,3 +1,8 @@ +from . import dsp +from . import common +from . import framing +from . import equalizer + import numpy as np import logging import itertools @@ -6,11 +11,6 @@ import time log = logging.getLogger(__name__) -from . import dsp -from . import common -from . import framing -from . import equalizer - class Receiver(object): diff --git a/amodem/send.py b/amodem/send.py index 95eb85e..170bab1 100644 --- a/amodem/send.py +++ b/amodem/send.py @@ -1,13 +1,13 @@ +from . import common +from . import equalizer +from . import dsp + import numpy as np import logging import itertools log = logging.getLogger(__name__) -from . import common -from . import equalizer -from . import dsp - class Sender(object): def __init__(self, fd, config): diff --git a/tests/test_dsp.py b/tests/test_dsp.py index 1e8f77c..8a7b218 100644 --- a/tests/test_dsp.py +++ b/tests/test_dsp.py @@ -1,11 +1,9 @@ -import numpy as np -from numpy.linalg import norm - from amodem import dsp from amodem import sampling from amodem import config config = config.fastest() +import numpy as np import random import itertools diff --git a/tests/test_transfer.py b/tests/test_transfer.py index 308d6bc..b45b1c4 100644 --- a/tests/test_transfer.py +++ b/tests/test_transfer.py @@ -1,16 +1,14 @@ -import os -from io import BytesIO - -import numpy as np - from amodem import main from amodem import common from amodem import dsp from amodem import sampling from amodem import config -from amodem import async config = config.fastest() +import numpy as np +import os +from io import BytesIO + import logging logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-12s %(message)s')