From cbdf4d16165ab97c7b2d9229c83bdfea6c1e6d8f Mon Sep 17 00:00:00 2001
From: Roman Zeyde <roman.zeyde@gmail.com>
Date: Sat, 7 Feb 2015 09:02:26 +0200
Subject: [PATCH] PEP8 fixes

lambdas and imports
---
 amodem/equalizer.py    | 14 ++++++++++----
 tests/test_calib.py    |  3 ++-
 tests/test_dsp.py      |  3 ++-
 tests/test_transfer.py |  3 ++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/amodem/equalizer.py b/amodem/equalizer.py
index d1d5f1b..7afa108 100644
--- a/amodem/equalizer.py
+++ b/amodem/equalizer.py
@@ -20,10 +20,16 @@ class Equalizer(object):
 
     def train_symbols(self, length, seed=0, constant_prefix=16):
         r = random.Random(seed)
-        # Use low-level randomness for cross-version compatibility.
-        random_symbol = lambda: self._constellation[r.getrandbits(2)]
-        choose = lambda: [random_symbol() for j in range(self.Nfreq)]
-        symbols = np.array([choose() for _ in range(length)])
+
+        def random_symbol():
+            ''' use low-level randomness for cross-version compatibility. '''
+            return self._constellation[r.getrandbits(2)]
+
+        symbols = []
+        for _ in range(length):
+            symbols.append([random_symbol() for _ in range(self.Nfreq)])
+
+        symbols = np.array(symbols)
         # Constant symbols (for analog debugging)
         symbols[:constant_prefix, :] = 1
         return symbols
diff --git a/tests/test_calib.py b/tests/test_calib.py
index f64b42c..d01d8cb 100644
--- a/tests/test_calib.py
+++ b/tests/test_calib.py
@@ -1,7 +1,6 @@
 from amodem import calib
 from amodem import common
 from amodem import config
-config = config.fastest()
 
 from io import BytesIO
 
@@ -10,6 +9,8 @@ import random
 import pytest
 import mock
 
+config = config.fastest()
+
 
 class ProcessMock(object):
     def __init__(self):
diff --git a/tests/test_dsp.py b/tests/test_dsp.py
index 6f6f7e5..36479d9 100644
--- a/tests/test_dsp.py
+++ b/tests/test_dsp.py
@@ -1,12 +1,13 @@
 from amodem import dsp
 from amodem import sampling
 from amodem import config
-config = config.fastest()
 
 import numpy as np
 import random
 import itertools
 
+config = config.fastest()
+
 
 def test_linreg():
     x = np.array([1, 3, 2, 8, 4, 6, 9, 7, 0, 5])
diff --git a/tests/test_transfer.py b/tests/test_transfer.py
index b45b1c4..3343a94 100644
--- a/tests/test_transfer.py
+++ b/tests/test_transfer.py
@@ -3,7 +3,6 @@ from amodem import common
 from amodem import dsp
 from amodem import sampling
 from amodem import config
-config = config.fastest()
 
 import numpy as np
 import os
@@ -15,6 +14,8 @@ logging.basicConfig(level=logging.DEBUG,
 
 import pytest
 
+config = config.fastest()
+
 
 class Args(object):
     def __init__(self, **kwargs):