merge from main

app/main/views/api_keys.py

@@ -1,12 +1,4 @@
-from flask import (
-    Markup,
-    abort,
-    flash,
-    redirect,
-    render_template,
-    request,
-    url_for,
-)
+from flask import Markup, abort, flash, redirect, render_template, request, url_for
 from flask_login import current_user
 
 from app import (

app/main/views/dashboard.py

@@ -3,15 +3,7 @@ from datetime import datetime
 from functools import partial
 from itertools import groupby
 
-from flask import (
-    Response,
-    abort,
-    jsonify,
-    render_template,
-    request,
-    session,
-    url_for,
-)
+from flask import Response, abort, jsonify, render_template, request, session, url_for
 from flask_login import current_user
 from notifications_utils.recipients import format_phone_number_human_readable
 from werkzeug.utils import redirect

app/main/views/feedback.py

@@ -4,19 +4,12 @@ import pytz
 from flask import redirect, render_template, request, session, url_for
 from flask_login import current_user
 from govuk_bank_holidays.bank_holidays import BankHolidays
-from notifications_utils.clients.zendesk.zendesk_client import (
-    NotifySupportTicket,
-)
+from notifications_utils.clients.zendesk.zendesk_client import NotifySupportTicket
 
 from app import convert_to_boolean, current_service
 from app.extensions import zendesk_client
 from app.main import main
-from app.main.forms import (
-    FeedbackOrProblem,
-    SupportRedirect,
-    SupportType,
-    Triage,
-)
+from app.main.forms import FeedbackOrProblem, SupportRedirect, SupportType, Triage
 from app.models.feedback import (
     GENERAL_TICKET_TYPE,
     PROBLEM_TICKET_TYPE,

app/main/views/index.py

@@ -14,10 +14,7 @@ from app import email_branding_client, status_api_client
 from app.main import main
 from app.main.forms import FieldWithNoneOption
 from app.main.views.pricing import CURRENT_SMS_RATE
-from app.main.views.sub_navigation_dictionaries import (
-    features_nav,
-    using_notify_nav,
-)
+from app.main.views.sub_navigation_dictionaries import features_nav, using_notify_nav
 from app.utils.user import user_is_logged_in
 
 

app/main/views/invites.py

@@ -5,13 +5,7 @@ from markupsafe import Markup
 from app.main import main
 from app.models.organization import Organization
 from app.models.service import Service
-from app.models.user import (
-    InvitedOrgUser,
-    InvitedUser,
-    OrganizationUsers,
-    User,
-    Users,
-)
+from app.models.user import InvitedOrgUser, InvitedUser, OrganizationUsers, User, Users
 
 
 @main.route("/invitation/<token>")

app/main/views/jobs.py

@@ -14,10 +14,7 @@ from flask import (
     url_for,
 )
 from flask_login import current_user
-from notifications_utils.template import (
-    EmailPreviewTemplate,
-    SMSBodyPreviewTemplate,
-)
+from notifications_utils.template import EmailPreviewTemplate, SMSBodyPreviewTemplate
 
 from app import (
     current_service,

app/main/views/manage_users.py

@@ -1,12 +1,4 @@
-from flask import (
-    abort,
-    flash,
-    redirect,
-    render_template,
-    request,
-    session,
-    url_for,
-)
+from flask import abort, flash, redirect, render_template, request, session, url_for
 from flask_login import current_user
 from notifications_python_client.errors import HTTPError
 

app/main/views/pricing.py

@@ -1,8 +1,6 @@
 from flask import current_app, render_template
 from flask_login import current_user
-from notifications_utils.international_billing_rates import (
-    INTERNATIONAL_BILLING_RATES,
-)
+from notifications_utils.international_billing_rates import INTERNATIONAL_BILLING_RATES
 
 from app.main import main
 from app.main.forms import SearchByNameForm

app/main/views/send.py

@@ -42,11 +42,7 @@ from app.s3_client.s3_csv_client import (
     s3upload,
     set_metadata_on_csv_upload,
 )
-from app.utils import (
-    PermanentRedirect,
-    should_skip_template_page,
-    unicode_truncate,
-)
+from app.utils import PermanentRedirect, should_skip_template_page, unicode_truncate
 from app.utils.csv import Spreadsheet, get_errors_for_csv
 from app.utils.templates import get_template
 from app.utils.user import user_has_permissions

app/main/views/service_settings.py

@@ -13,9 +13,7 @@ from flask import (
 )
 from flask_login import current_user
 from notifications_python_client.errors import HTTPError
-from notifications_utils.clients.zendesk.zendesk_client import (
-    NotifySupportTicket,
-)
+from notifications_utils.clients.zendesk.zendesk_client import NotifySupportTicket
 
 from app import (
     billing_api_client,

app/main/views/templates.py

@@ -1,14 +1,6 @@
 from functools import partial
 
-from flask import (
-    abort,
-    flash,
-    jsonify,
-    redirect,
-    render_template,
-    request,
-    url_for,
-)
+from flask import abort, flash, jsonify, redirect, render_template, request, url_for
 from flask_login import current_user
 from notifications_python_client.errors import HTTPError
 from notifications_utils import SMS_CHAR_COUNT_LIMIT

app/main/views/two_factor.py

@@ -1,13 +1,6 @@
 import json
 
-from flask import (
-    current_app,
-    redirect,
-    render_template,
-    request,
-    session,
-    url_for,
-)
+from flask import current_app, redirect, render_template, request, session, url_for
 from flask_login import current_user
 from itsdangerous import SignatureExpired
 from notifications_utils.url_safe_token import check_token

app/main/views/verify.py

@@ -1,14 +1,6 @@
 import json
 
-from flask import (
-    abort,
-    current_app,
-    flash,
-    redirect,
-    render_template,
-    session,
-    url_for,
-)
+from flask import abort, current_app, flash, redirect, render_template, session, url_for
 from itsdangerous import SignatureExpired
 from notifications_utils.url_safe_token import check_token