Merge pull request #140 from synthicity/pep8s

Turn some lambdas into defs

urbansim/accounts.py

@@ -141,10 +141,10 @@ def to_frame(self):
         col_names = _column_names_from_metadata(
             t.metadata for t in self.transactions)
 
-        trow = lambda t: (
-            toolz.concatv(
+        def trow(t):
+            return toolz.concatv(
                 (t.amount, t.subaccount),
-                (t.metadata.get(c) for c in col_names)))
+                (t.metadata.get(c) for c in col_names))
         rows = [trow(t) for t in self.transactions]
 
         if len(rows) == 0:

urbansim/models/tests/test_regression.py

@@ -49,7 +49,8 @@ def test_predict(test_df):
 
 
 def test_predict_ytransform(test_df):
-    yt = lambda x: x / 2.
+    def yt(x):
+        return x / 2.
     filters = ['col1 in [0, 2, 4]']
     model_exp = 'col1 ~ col2'
     fit = regression.fit_model(test_df, filters, model_exp)
@@ -105,7 +106,10 @@ def test_RegressionModel(test_df):
     fit_filters = ['col1 in [0, 2, 4]']
     predict_filters = ['col1 in [1, 3]']
     model_exp = 'col1 ~ col2'
-    ytransform = lambda x: x / 2.
+
+    def ytransform(x):
+        return x / 2.
+
     name = 'test hedonic'
 
     model = regression.RegressionModel(

urbansim/sim/tests/test_simulation.py

@@ -154,7 +154,9 @@ def test_cached_uncopied():
                   copy_col=False)
     for column_name in ['a', 'b']:
         label = "test_frame_uncopied.{}".format(column_name)
-        func = lambda col=label: col
+
+        def func(col=label):
+            return col
         for table_name in ['test_copied_columns', 'test_uncopied_columns']:
             sim.add_column(table_name, column_name, func)
 
@@ -288,7 +290,8 @@ def table():
     def column(variable='x'):
         return series * variable
 
-    c = lambda: sim._COLUMNS[key]
+    def c():
+        return sim._COLUMNS[key]
 
     pdt.assert_series_equal(c()(), series * 2)
     sim.add_injectable('x', 3)
@@ -322,7 +325,8 @@ def table():
     def column(x):
         return series * x
 
-    c = lambda: sim._COLUMNS[key]
+    def c():
+        return sim._COLUMNS[key]
 
     sim.disable_cache()
 
@@ -556,7 +560,8 @@ def test_injectables_cache():
     def inj():
         return x * x
 
-    i = lambda: sim._INJECTABLES['inj']
+    def i():
+        return sim._INJECTABLES['inj']
 
     assert i()() == 4
     x = 3
@@ -580,7 +585,8 @@ def test_injectables_cache_disabled():
     def inj():
         return x * x
 
-    i = lambda: sim._INJECTABLES['inj']
+    def i():
+        return sim._INJECTABLES['inj']
 
     sim.disable_cache()
 
@@ -607,7 +613,8 @@ def x(s):
 
     assert 'x' in sim._MEMOIZED
 
-    getx = lambda: sim.get_injectable('x')
+    def getx():
+        return sim.get_injectable('x')
 
     assert hasattr(getx(), 'cache')
     assert hasattr(getx(), 'clear_cached')
@@ -628,7 +635,8 @@ def test_memoized_injectable_cache_off():
     def x(s):
         return outside + s
 
-    getx = lambda: sim.get_injectable('x')('y')
+    def getx():
+        return sim.get_injectable('x')('y')
 
     sim.disable_cache()
 
@@ -819,8 +827,11 @@ def model(table):
 def test_run_and_write_tables(df, store_name):
     sim.add_table('table', df)
 
-    year_key = lambda y: '{}'.format(y)
-    series_year = lambda y: pd.Series([y] * 3, index=df.index)
+    def year_key(y):
+        return '{}'.format(y)
+
+    def series_year(y):
+        return pd.Series([y] * 3, index=df.index)
 
     @sim.model()
     def model(year, table):