From cb43ed0cfe0751bebc63f79675c5f9ea284d1bcc Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Thu, 9 Aug 2018 17:27:47 +0100
Subject: [PATCH] Fix lint errors
---
opentech/apply/funds/models/submissions.py | 2 +-
opentech/apply/funds/tests/factories/models.py | 1 -
opentech/apply/review/tests/factories/models.py | 14 ++++++++------
opentech/apply/stream_forms/testing/factories.py | 8 ++++----
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index 94b452e2f..65ff60084 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -570,7 +570,7 @@ class ApplicationSubmission(
return self.form_data[id]
except KeyError as e:
try:
- transposed_must_include = {v:k for k,v in self.must_include.items()}
+ transposed_must_include = {v: k for k, v in self.must_include.items()}
actual_id = transposed_must_include[id]
except KeyError:
# We have most likely progressed application forms so the data isnt in form_data
diff --git a/opentech/apply/funds/tests/factories/models.py b/opentech/apply/funds/tests/factories/models.py
index 9dc634830..cffdc36f1 100644
--- a/opentech/apply/funds/tests/factories/models.py
+++ b/opentech/apply/funds/tests/factories/models.py
@@ -1,4 +1,3 @@
-from collections import defaultdict
import datetime
import factory
diff --git a/opentech/apply/review/tests/factories/models.py b/opentech/apply/review/tests/factories/models.py
index 83ee6ce79..79a82eb4b 100644
--- a/opentech/apply/review/tests/factories/models.py
+++ b/opentech/apply/review/tests/factories/models.py
@@ -1,5 +1,3 @@
-from collections import defaultdict
-
import factory
from opentech.apply.funds.models.forms import ApplicationBaseReviewForm
@@ -13,9 +11,9 @@ from ...views import get_fields_for_stage
from . import blocks
-__all__ = ['ReviewFactory', 'ReviewFormFactory', 'ApplicationBaseReviewFormFactory',
- 'ReviewFundTypeFactory', 'ReviewApplicationSubmissionFactory']
-
+__all__ = ['ReviewFactory', 'ReviewFormFactory',
+ 'ApplicationBaseReviewFormFactory', 'ReviewFundTypeFactory',
+ 'ReviewApplicationSubmissionFactory']
class ReviewFormDataFactory(factory.DictFactory, metaclass=AddFormFieldsMetaclass):
@@ -46,7 +44,11 @@ class ReviewFactory(factory.DjangoModelFactory):
submission = factory.SubFactory(ApplicationSubmissionFactory)
author = factory.SubFactory(StaffFactory)
form_fields = blocks.ReviewFormFieldsFactory
- form_data = factory.SubFactory(ReviewFormDataFactory, form_fields=factory.SelfAttribute('..form_fields'), submission=factory.SelfAttribute('..submission'))
+ form_data = factory.SubFactory(
+ ReviewFormDataFactory,
+ form_fields=factory.SelfAttribute('..form_fields'),
+ submission=factory.SelfAttribute('..submission'),
+ )
is_draft = False
recommendation = NO
score = 0
diff --git a/opentech/apply/stream_forms/testing/factories.py b/opentech/apply/stream_forms/testing/factories.py
index f1bdf4479..dfccb6bf9 100644
--- a/opentech/apply/stream_forms/testing/factories.py
+++ b/opentech/apply/stream_forms/testing/factories.py
@@ -11,9 +11,10 @@ import wagtail_factories
from opentech.apply.stream_forms import blocks as stream_blocks
-__all__ = ['CharBlockFactory', 'FormFieldBlockFactory', 'CharFieldBlockFactory', 'NumberFieldBlockFactory',
- 'RadioFieldBlockFactory', 'UploadableMediaFactory', 'ImageFieldBlockFactory', 'FileFieldBlockFactory',
- 'MultiFileFieldBlockFactory']
+__all__ = ['FormFieldBlockFactory', 'CharFieldBlockFactory',
+ 'NumberFieldBlockFactory', 'RadioFieldBlockFactory',
+ 'UploadableMediaFactory', 'ImageFieldBlockFactory',
+ 'FileFieldBlockFactory', 'MultiFileFieldBlockFactory']
class AnswerFactory(factory.Factory):
@@ -80,7 +81,6 @@ class FormFieldBlockFactory(wagtail_factories.StructBlockFactory):
field_label = factory.Faker('sentence')
help_text = factory.LazyAttribute(lambda o: str(o._Resolver__step.builder.factory_meta.model))
-
class Meta:
model = stream_blocks.FormFieldBlock
--
GitLab