Merge remote-tracking branch 'leapcode/pr/188' into develop

2 files changed, 7 insertions, 6 deletions

diff --git a/src/leap/mail/adaptors/models.py b/src/leap/mail/adaptors/models.py
index 88e0e4e..2bf9e60 100644
--- a/src/leap/mail/adaptors/models.py
+++ b/src/leap/mail/adaptors/models.py
@@ -115,10 +115,8 @@ class DocumentWrapper(object):
 
 def _normalize_dict(_dict):
     items = _dict.items()
-    not_callable = lambda (k, v): not callable(v)
-    not_private = lambda(k, v): not k.startswith('_')
-    for cond in not_callable, not_private:
-        items = filter(cond, items)
+    items = filter(lambda (k, v): not callable(v), items)
+    items = filter(lambda (k, v): not k.startswith('_'), items)
     items = [(k, v) if not k.endswith('_') else (k[:-1], v)
              for (k, v) in items]
     items = [(k.replace('-', '_'), v) for (k, v) in items]
diff --git a/src/leap/mail/adaptors/tests/test_models.py b/src/leap/mail/adaptors/tests/test_models.py
index efe0bf2..b82cfad 100644
--- a/src/leap/mail/adaptors/tests/test_models.py
+++ b/src/leap/mail/adaptors/tests/test_models.py
@@ -39,7 +39,8 @@ class SerializableModelsTestCase(unittest.TestCase):
             class IgnoreMe(object):
                 pass
 
-            killmeplease = lambda x: x
+            def killmeplease(x):
+                return x
 
         serialized = M.serialize()
         expected = {'foo': 42, 'bar': 33, 'baaz': None}
@@ -88,7 +89,9 @@ class DocumentWrapperTestCase(unittest.TestCase):
         class Wrapper(models.DocumentWrapper):
             class model(models.SerializableModel):
                 foo = 42
-        getwrapper = lambda: Wrapper(bar=1)
+
+        def getwrapper():
+            return Wrapper(bar=1)
         self.assertRaises(RuntimeError, getwrapper)
 
     def test_no_model_wrapper(self):