From ca6350cc271b304dbbb70fa65d8552b55c8a0d4f Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 11:30:09 +0200 Subject: [PATCH] optimize import in all files --- app/api/base.py | 1 + app/api/views/auth_mfa.py | 2 +- app/auth/views/register.py | 4 ++-- app/auth/views/reset_password.py | 1 - app/config.py | 2 -- app/dashboard/views/alias_contact_manager.py | 1 - app/dashboard/views/billing.py | 2 +- app/dashboard/views/index.py | 20 -------------------- app/dashboard/views/lifetime_licence.py | 8 +------- app/dashboard/views/mailbox.py | 3 +-- app/dashboard/views/mailbox_detail.py | 7 ++++--- app/dashboard/views/referral.py | 2 +- app/developer/views/new_client.py | 2 -- app/models.py | 2 +- app/oauth/views/authorize.py | 2 +- app/s3.py | 2 +- 16 files changed, 15 insertions(+), 46 deletions(-) diff --git a/app/api/base.py b/app/api/base.py index 5e7ca419..36d9bd50 100644 --- a/app/api/base.py +++ b/app/api/base.py @@ -3,6 +3,7 @@ from functools import wraps import arrow from flask import Blueprint, request, jsonify, g from flask_login import current_user + from app.extensions import db from app.models import ApiKey diff --git a/app/api/views/auth_mfa.py b/app/api/views/auth_mfa.py index c53a0b9c..38de5426 100644 --- a/app/api/views/auth_mfa.py +++ b/app/api/views/auth_mfa.py @@ -1,7 +1,7 @@ import pyotp from flask import jsonify, request from flask_cors import cross_origin -from itsdangerous import Signer, BadSignature +from itsdangerous import Signer from app.api.base import api_bp from app.config import FLASK_SECRET diff --git a/app/auth/views/register.py b/app/auth/views/register.py index fd9acfe0..e4caa022 100644 --- a/app/auth/views/register.py +++ b/app/auth/views/register.py @@ -6,11 +6,11 @@ from wtforms import StringField, validators from app import email_utils, config from app.auth.base import auth_bp from app.auth.views.login_utils import get_referral -from app.config import URL, DISABLE_REGISTRATION +from app.config import URL from app.email_utils import can_be_used_as_personal_email, email_already_used from app.extensions import db from app.log import LOG -from app.models import User, ActivationCode, Referral +from app.models import User, ActivationCode from app.utils import random_string, encode_url diff --git a/app/auth/views/reset_password.py b/app/auth/views/reset_password.py index 77635a1a..1e7ba046 100644 --- a/app/auth/views/reset_password.py +++ b/app/auth/views/reset_password.py @@ -1,4 +1,3 @@ -import arrow from flask import request, flash, render_template, redirect, url_for from flask_login import login_user from flask_wtf import FlaskForm diff --git a/app/config.py b/app/config.py index b0fbad06..158c1331 100644 --- a/app/config.py +++ b/app/config.py @@ -2,8 +2,6 @@ import os import random import string import subprocess -import tempfile -from uuid import uuid4 from dotenv import load_dotenv diff --git a/app/dashboard/views/alias_contact_manager.py b/app/dashboard/views/alias_contact_manager.py index 1ad1ead1..8f3f4752 100644 --- a/app/dashboard/views/alias_contact_manager.py +++ b/app/dashboard/views/alias_contact_manager.py @@ -1,5 +1,4 @@ import re -from email.utils import parseaddr from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user diff --git a/app/dashboard/views/billing.py b/app/dashboard/views/billing.py index 7c44e73d..9f8def67 100644 --- a/app/dashboard/views/billing.py +++ b/app/dashboard/views/billing.py @@ -3,9 +3,9 @@ from flask_login import login_required, current_user from app.config import PADDLE_MONTHLY_PRODUCT_ID, PADDLE_YEARLY_PRODUCT_ID from app.dashboard.base import dashboard_bp +from app.extensions import db from app.log import LOG from app.models import Subscription, PlanEnum -from app.extensions import db from app.paddle_utils import cancel_subscription, change_plan diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index b00bc1c3..ca5c1941 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -1,42 +1,22 @@ -from dataclasses import dataclass - -from arrow import Arrow from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user -from sqlalchemy import or_, func, case from sqlalchemy.exc import IntegrityError from sqlalchemy.orm import joinedload from app import email_utils from app.api.serializer import get_alias_infos_with_pagination_v2 -from app.config import PAGE_LIMIT from app.dashboard.base import dashboard_bp from app.extensions import db from app.log import LOG from app.models import ( Alias, ClientUser, - Contact, - EmailLog, DeletedAlias, AliasGeneratorEnum, Mailbox, ) -@dataclass -class AliasInfo: - alias: Alias - mailbox: Mailbox - - nb_forward: int - nb_blocked: int - nb_reply: int - - latest_email_log: EmailLog = None - latest_contact: Contact = None - - @dashboard_bp.route("/", methods=["GET", "POST"]) @login_required def index(): diff --git a/app/dashboard/views/lifetime_licence.py b/app/dashboard/views/lifetime_licence.py index ede94836..aef2d365 100644 --- a/app/dashboard/views/lifetime_licence.py +++ b/app/dashboard/views/lifetime_licence.py @@ -3,13 +3,7 @@ from flask_login import login_required, current_user from flask_wtf import FlaskForm from wtforms import StringField, validators -from app.config import ( - PADDLE_VENDOR_ID, - PADDLE_MONTHLY_PRODUCT_ID, - PADDLE_YEARLY_PRODUCT_ID, - URL, - ADMIN_EMAIL, -) +from app.config import ADMIN_EMAIL from app.dashboard.base import dashboard_bp from app.email_utils import send_email from app.extensions import db diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py index 38ca190a..67894f02 100644 --- a/app/dashboard/views/mailbox.py +++ b/app/dashboard/views/mailbox.py @@ -1,7 +1,7 @@ from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user from flask_wtf import FlaskForm -from itsdangerous import Signer, BadSignature +from itsdangerous import Signer from wtforms import validators from wtforms.fields.html5 import EmailField @@ -9,7 +9,6 @@ from app.config import EMAIL_DOMAIN, ALIAS_DOMAINS, MAILBOX_SECRET, URL from app.dashboard.base import dashboard_bp from app.email_utils import ( can_be_used_as_personal_email, - email_already_used, mailbox_already_used, render, send_email, diff --git a/app/dashboard/views/mailbox_detail.py b/app/dashboard/views/mailbox_detail.py index c74baf06..7bf9b29f 100644 --- a/app/dashboard/views/mailbox_detail.py +++ b/app/dashboard/views/mailbox_detail.py @@ -1,21 +1,22 @@ +from smtplib import SMTPRecipientsRefused + from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user from flask_wtf import FlaskForm -from itsdangerous import Signer, BadSignature +from itsdangerous import Signer from wtforms import validators from wtforms.fields.html5 import EmailField from app.config import MAILBOX_SECRET from app.config import URL from app.dashboard.base import dashboard_bp -from app.email_utils import can_be_used_as_personal_email, email_already_used +from app.email_utils import can_be_used_as_personal_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, DeletedAlias from app.models import Mailbox from app.pgp_utils import PGPException, load_public_key -from smtplib import SMTPRecipientsRefused class ChangeEmailForm(FlaskForm): diff --git a/app/dashboard/views/referral.py b/app/dashboard/views/referral.py index ada99016..f9aedfa0 100644 --- a/app/dashboard/views/referral.py +++ b/app/dashboard/views/referral.py @@ -4,7 +4,7 @@ from flask_login import login_required, current_user from app.dashboard.base import dashboard_bp from app.extensions import db from app.log import LOG -from app.models import EmailLog, Referral +from app.models import Referral from app.utils import random_string diff --git a/app/developer/views/new_client.py b/app/developer/views/new_client.py index 021ba644..53c06036 100644 --- a/app/developer/views/new_client.py +++ b/app/developer/views/new_client.py @@ -3,10 +3,8 @@ from flask_login import current_user, login_required from flask_wtf import FlaskForm from wtforms import StringField, validators -from app import email_utils from app.developer.base import developer_bp from app.extensions import db -from app.log import LOG from app.models import Client diff --git a/app/models.py b/app/models.py index c5d329e5..03ecbc1b 100644 --- a/app/models.py +++ b/app/models.py @@ -1,7 +1,7 @@ import enum import random import uuid -from email.utils import parseaddr, formataddr +from email.utils import formataddr import arrow import bcrypt diff --git a/app/oauth/views/authorize.py b/app/oauth/views/authorize.py index 333b0f0d..740b20bc 100644 --- a/app/oauth/views/authorize.py +++ b/app/oauth/views/authorize.py @@ -28,7 +28,7 @@ from app.oauth_models import ( SUPPORTED_OPENID_FLOWS_STR, response_types_to_str, ) -from app.utils import random_string, encode_url, convert_to_id, random_word +from app.utils import random_string, encode_url, random_word @oauth_bp.route("/authorize", methods=["GET", "POST"]) diff --git a/app/s3.py b/app/s3.py index dd09bbf1..e4443ed8 100644 --- a/app/s3.py +++ b/app/s3.py @@ -1,5 +1,5 @@ -from io import BytesIO import os +from io import BytesIO import boto3 import requests