PEP8 fixes

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))
 

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):

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)]

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):
 

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
 

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):

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):
 

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):

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
 

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')