flake8 clean

Stefan Reinhard · Stefan Reinhard · commit 681d279ca291 · 2014-02-04T16:25:49.000+01:00
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -211,9 +211,8 @@ def __init__(self, *args, **kwargs):
                             get_fields(self, *args, **kwargs))
 
                     for k, v in self.custom_fields.items():
+                        v.initial = self.instance.parameters.get(k)
                         self.fields[k] = v
-                        if k in self.instance.parameters:
-                            self.fields[k].initial = self.instance.parameters[k]
 
             def save(self, commit=True, *args, **kwargs):
                 # Django ModelForms return the model instance from save. We'll
diff --git a/tests/testapp/tests/test_page.py b/tests/testapp/tests/test_page.py
@@ -1423,7 +1423,8 @@ def test_25_applicationcontent(self):
 
         # Check if admin_fields get populated correctly
         app_ct = page.applicationcontent_set.all()[0]
-        app_ct.parameters = '{"custom_field":"val42", "exclusive_subpages": false}'
+        app_ct.parameters = \
+            '{"custom_field":"val42", "exclusive_subpages": false}'
         app_ct.save()
         r = self.client.get('/admin/page/page/%d/' % page.id)
         self.assertContains(r, 'val42')
