From 09d00df363298b51fe140a4b5a5e92203503069f Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Sun, 27 Jun 2021 17:50:36 +0200 Subject: [PATCH] reformat imports --- app/auth/views/login.py | 2 +- app/auth/views/resend_activation.py | 2 +- app/dashboard/views/alias_contact_manager.py | 2 +- app/dashboard/views/mailbox_detail.py | 2 +- app/import_utils.py | 4 ++-- app/pw_models.py | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/auth/views/login.py b/app/auth/views/login.py index af7de16c..4d7ae548 100644 --- a/app/auth/views/login.py +++ b/app/auth/views/login.py @@ -5,10 +5,10 @@ from wtforms import StringField, validators from app.auth.base import auth_bp from app.auth.views.login_utils import after_login -from app.utils import sanitize_email from app.extensions import limiter from app.log import LOG from app.models import User +from app.utils import sanitize_email class LoginForm(FlaskForm): diff --git a/app/auth/views/resend_activation.py b/app/auth/views/resend_activation.py index b97e4d05..1585384e 100644 --- a/app/auth/views/resend_activation.py +++ b/app/auth/views/resend_activation.py @@ -4,9 +4,9 @@ from wtforms import StringField, validators from app.auth.base import auth_bp from app.auth.views.register import send_activation_email -from app.utils import sanitize_email from app.log import LOG from app.models import User +from app.utils import sanitize_email class ResendActivationForm(FlaskForm): diff --git a/app/dashboard/views/alias_contact_manager.py b/app/dashboard/views/alias_contact_manager.py index 86e07c5f..13a0effa 100644 --- a/app/dashboard/views/alias_contact_manager.py +++ b/app/dashboard/views/alias_contact_manager.py @@ -15,10 +15,10 @@ from app.email_utils import ( is_valid_email, generate_reply_email, ) -from app.utils import sanitize_email from app.extensions import db from app.log import LOG from app.models import Alias, Contact, EmailLog +from app.utils import sanitize_email def email_validator(): diff --git a/app/dashboard/views/mailbox_detail.py b/app/dashboard/views/mailbox_detail.py index 073c51a8..f11326ce 100644 --- a/app/dashboard/views/mailbox_detail.py +++ b/app/dashboard/views/mailbox_detail.py @@ -11,13 +11,13 @@ from app.config import ENFORCE_SPF, MAILBOX_SECRET from app.config import URL from app.dashboard.base import dashboard_bp from app.email_utils import email_can_be_used_as_mailbox -from app.utils import sanitize_email from app.email_utils import mailbox_already_used, render, send_email from app.extensions import db from app.log import LOG from app.models import Alias, AuthorizedAddress from app.models import Mailbox from app.pgp_utils import PGPException, load_public_key_and_check +from app.utils import sanitize_email class ChangeEmailForm(FlaskForm): diff --git a/app/import_utils.py b/app/import_utils.py index e751ad28..88ca6263 100644 --- a/app/import_utils.py +++ b/app/import_utils.py @@ -1,6 +1,5 @@ -from .log import LOG - import csv + import requests from app import s3 @@ -17,6 +16,7 @@ from app.models import ( User, ) from app.utils import sanitize_email +from .log import LOG def handle_batch_import(batch_import: BatchImport): diff --git a/app/pw_models.py b/app/pw_models.py index bde5b6ce..6923addc 100644 --- a/app/pw_models.py +++ b/app/pw_models.py @@ -4,7 +4,6 @@ import bcrypt from app.extensions import db - _NORMALIZATION_FORM = "NFKC"