From cfe9b7589e3130671b78c6dd88bf08376e8d8697 Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 27 Aug 2018 10:59:40 -0400 Subject: [PATCH] Formatting --- atst/app.py | 11 ++++++----- atst/domain/requests.py | 4 +++- atst/domain/task_orders.py | 5 ++++- atst/forms/financial.py | 5 ++++- atst/routes/requests/financial_verification.py | 1 - atst/uploader.py | 2 +- tests/conftest.py | 1 - tests/mocks.py | 1 - tests/test_uploader.py | 1 - 9 files changed, 18 insertions(+), 13 deletions(-) diff --git a/atst/app.py b/atst/app.py index de5c7baf..f0e5ffc6 100644 --- a/atst/app.py +++ b/atst/app.py @@ -146,11 +146,12 @@ def make_crl_validator(app): def make_eda_client(app): app.eda_client = MockEDAClient() + def make_upload_storage(app): uploader = Uploader( - provider=app.config.get("STORAGE_PROVIDER"), - container=app.config.get("STORAGE_CONTAINER"), - key=app.config.get("STORAGE_KEY"), - secret=app.config.get("STORAGE_SECRET") - ) + provider=app.config.get("STORAGE_PROVIDER"), + container=app.config.get("STORAGE_CONTAINER"), + key=app.config.get("STORAGE_KEY"), + secret=app.config.get("STORAGE_SECRET"), + ) app.uploader = uploader diff --git a/atst/domain/requests.py b/atst/domain/requests.py index b13e43ff..57c69d4c 100644 --- a/atst/domain/requests.py +++ b/atst/domain/requests.py @@ -251,7 +251,9 @@ WHERE requests_with_status.status = :status else: task_order_number = request_data.get("task_order_number") - if "task_order" in request_data and isinstance(request_data["task_order"], FileStorage): + if "task_order" in request_data and isinstance( + request_data["task_order"], FileStorage + ): task_order_data["pdf"] = request_data.pop("task_order") task_order = TaskOrders.get_or_create_task_order( diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py index 77fafae0..0b449083 100644 --- a/atst/domain/task_orders.py +++ b/atst/domain/task_orders.py @@ -58,5 +58,8 @@ class TaskOrders(object): # should catch the error here attachment = Attachment.attach(pdf_file) return TaskOrders.create( - **task_order_data, number=number, source=Source.MANUAL, pdf=attachment + **task_order_data, + number=number, + source=Source.MANUAL, + pdf=attachment, ) diff --git a/atst/forms/financial.py b/atst/forms/financial.py index 68bdce1a..1b9789ef 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -216,4 +216,7 @@ class ExtendedFinancialForm(BaseFinancialForm): filters=[number_to_int], ) - task_order = FileField("Upload a copy of your Task Order", validators=[FileAllowed(['pdf'], 'Only PDF documents can be uploaded.')]) + task_order = FileField( + "Upload a copy of your Task Order", + validators=[FileAllowed(["pdf"], "Only PDF documents can be uploaded.")], + ) diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index 29f5ce39..17137387 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -30,7 +30,6 @@ def update_financial_verification(request_id): post_data = http_request.form existing_request = Requests.get(request_id) form = financial_form(post_data) - rerender_args = dict( request_id=request_id, f=form, extended=http_request.args.get("extended") ) diff --git a/atst/uploader.py b/atst/uploader.py index 9ec55287..167c3d03 100644 --- a/atst/uploader.py +++ b/atst/uploader.py @@ -7,7 +7,7 @@ class UploadError(Exception): pass -class Uploader(): +class Uploader: _PERMITTED_MIMETYPES = ["application/pdf"] def __init__(self, provider, container=None, key=None, secret=None): diff --git a/tests/conftest.py b/tests/conftest.py index 0c0eacf0..aa4558c1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -26,7 +26,6 @@ def app(request): ctx = _app.app_context() ctx.push() - yield _app upload_dir.cleanup() diff --git a/tests/mocks.py b/tests/mocks.py index 63a13bd6..f374b792 100644 --- a/tests/mocks.py +++ b/tests/mocks.py @@ -13,4 +13,3 @@ MOCK_VALID_PE_ID = "8675309U" FIXTURE_EMAIL_ADDRESS = "artgarfunkel@uso.mil" PDF_FILENAME = "tests/fixtures/sample.pdf" - diff --git a/tests/test_uploader.py b/tests/test_uploader.py index cbe39c45..89ec1b73 100644 --- a/tests/test_uploader.py +++ b/tests/test_uploader.py @@ -31,4 +31,3 @@ def test_upload_fails_for_non_pdfs(uploader): fs = FileStorage(fp, content_type="text/plain") with pytest.raises(UploadError): uploader.upload(fs) -