From 8e88c507d49019e193f197baf35155f5a4c760bb Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 19 Feb 2018 12:35:02 +0000
Subject: [PATCH] Fix flake8 errors and mypy
---
opentech/apply/funds/models.py | 11 +++++------
opentech/apply/stream_forms/blocks.py | 6 +++---
setup.cfg | 3 +++
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py
index 5dac2ef8d..dc19447f0 100644
--- a/opentech/apply/funds/models.py
+++ b/opentech/apply/funds/models.py
@@ -61,7 +61,7 @@ class SubmittableStreamForm(AbstractStreamForm):
def process_form_submission(self, form):
if not form.user.is_authenticated():
- form.user= None
+ form.user = None
return self.get_submission_class().objects.create(
form_data=form.cleaned_data,
form_fields=self.get_defined_fields(),
@@ -498,14 +498,13 @@ class ApplicationSubmission(WorkflowHelpers, AbstractFormSubmission):
except KeyError:
pass # It was a named field or a paragraph
else:
- form_field = stream_value.block.get_field(stream_value.value)
yield data, stream_value
def render_answers(self):
- context = {'fields': list()} # type: ignore
- fields = []
- for data, field in self.data_and_fields():
- fields.append(field.render(context={'data': data}))
+ fields = [
+ field.render(context={'data': data})
+ for data, field in self.data_and_fields()
+ ]
return mark_safe(''.join(fields))
def prepare_search_values(self):
diff --git a/opentech/apply/stream_forms/blocks.py b/opentech/apply/stream_forms/blocks.py
index 290e750de..94fa52a96 100644
--- a/opentech/apply/stream_forms/blocks.py
+++ b/opentech/apply/stream_forms/blocks.py
@@ -68,7 +68,7 @@ class CharFieldBlock(OptionalFormFieldBlock):
class Meta:
label = _('Text field (single line)')
- template ='stream_forms/render_unsafe_field.html'
+ template = 'stream_forms/render_unsafe_field.html'
def get_field_class(self, struct_value):
text_format = struct_value['format']
@@ -89,7 +89,7 @@ class TextFieldBlock(OptionalFormFieldBlock):
class Meta:
label = _('Text field (multi line)')
- template ='stream_forms/render_unsafe_field.html'
+ template = 'stream_forms/render_unsafe_field.html'
def get_searchable_content(self, value, data):
return bleach.clean(data, tags=[], strip=True)
@@ -155,7 +155,7 @@ class CheckboxesFieldBlock(OptionalFormFieldBlock):
class Meta:
label = _('Multiple checkboxes field')
icon = 'list-ul'
- template ='stream_forms/render_list_field.html'
+ template = 'stream_forms/render_list_field.html'
def get_field_kwargs(self, struct_value):
kwargs = super(CheckboxesFieldBlock,
diff --git a/setup.cfg b/setup.cfg
index 4c681954a..28cc5bb72 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,6 +10,9 @@ ignore_errors = True
check_untyped_defs = True
ignore_errors = False
+[mypy-opentech.apply.funds.tests.factories*]
+ignore_errors = True
+
# Enforce writing type definitions within workflow
[mypy-opentech.apply.funds.workflow*]
disallow_untyped_defs = True
--
GitLab