浏览代码

Optimize imports

Son NK 5 年之前
父节点
当前提交
b95b758692

+ 1 - 1
app/api/views/new_custom_alias.py

@@ -5,7 +5,7 @@ from itsdangerous import SignatureExpired
 
 
 from app.api.base import api_bp, require_api_auth
 from app.api.base import api_bp, require_api_auth
 from app.api.serializer import serialize_alias_info, get_alias_info
 from app.api.serializer import serialize_alias_info, get_alias_info
-from app.config import MAX_NB_EMAIL_FREE_PLAN, ALIAS_DOMAINS
+from app.config import MAX_NB_EMAIL_FREE_PLAN
 from app.dashboard.views.custom_alias import verify_prefix_suffix, signer
 from app.dashboard.views.custom_alias import verify_prefix_suffix, signer
 from app.extensions import db
 from app.extensions import db
 from app.log import LOG
 from app.log import LOG

+ 1 - 5
app/auth/views/facebook.py

@@ -1,22 +1,18 @@
 from flask import request, session, redirect, url_for, flash
 from flask import request, session, redirect, url_for, flash
-from flask_login import login_user
 from requests_oauthlib import OAuth2Session
 from requests_oauthlib import OAuth2Session
 from requests_oauthlib.compliance_fixes import facebook_compliance_fix
 from requests_oauthlib.compliance_fixes import facebook_compliance_fix
 
 
-from app import email_utils
 from app.auth.base import auth_bp
 from app.auth.base import auth_bp
 from app.auth.views.google import create_file_from_url
 from app.auth.views.google import create_file_from_url
 from app.config import (
 from app.config import (
     URL,
     URL,
     FACEBOOK_CLIENT_ID,
     FACEBOOK_CLIENT_ID,
     FACEBOOK_CLIENT_SECRET,
     FACEBOOK_CLIENT_SECRET,
-    DISABLE_REGISTRATION,
 )
 )
 from app.extensions import db
 from app.extensions import db
 from app.log import LOG
 from app.log import LOG
 from app.models import User, SocialAuth
 from app.models import User, SocialAuth
-from .login_utils import after_login, get_referral
-from ...email_utils import can_be_used_as_personal_email, email_already_used
+from .login_utils import after_login
 
 
 _authorization_base_url = "https://www.facebook.com/dialog/oauth"
 _authorization_base_url = "https://www.facebook.com/dialog/oauth"
 _token_url = "https://graph.facebook.com/oauth/access_token"
 _token_url = "https://graph.facebook.com/oauth/access_token"

+ 2 - 5
app/auth/views/github.py

@@ -1,12 +1,9 @@
 from flask import request, session, redirect, flash, url_for
 from flask import request, session, redirect, flash, url_for
-from flask_login import login_user
 from requests_oauthlib import OAuth2Session
 from requests_oauthlib import OAuth2Session
 
 
-from app import email_utils
 from app.auth.base import auth_bp
 from app.auth.base import auth_bp
-from app.auth.views.login_utils import after_login, get_referral
-from app.config import GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET, URL, DISABLE_REGISTRATION
-from app.email_utils import can_be_used_as_personal_email, email_already_used
+from app.auth.views.login_utils import after_login
+from app.config import GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET, URL
 from app.extensions import db
 from app.extensions import db
 from app.log import LOG
 from app.log import LOG
 from app.models import User, SocialAuth
 from app.models import User, SocialAuth

+ 3 - 5
app/auth/views/google.py

@@ -1,16 +1,14 @@
 from flask import request, session, redirect, flash, url_for
 from flask import request, session, redirect, flash, url_for
-from flask_login import login_user
 from requests_oauthlib import OAuth2Session
 from requests_oauthlib import OAuth2Session
 
 
-from app import s3, email_utils
+from app import s3
 from app.auth.base import auth_bp
 from app.auth.base import auth_bp
-from app.config import URL, GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET, DISABLE_REGISTRATION
+from app.config import URL, GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET
 from app.extensions import db
 from app.extensions import db
 from app.log import LOG
 from app.log import LOG
 from app.models import User, File, SocialAuth
 from app.models import User, File, SocialAuth
 from app.utils import random_string
 from app.utils import random_string
-from .login_utils import after_login, get_referral
-from ...email_utils import can_be_used_as_personal_email, email_already_used
+from .login_utils import after_login
 
 
 _authorization_base_url = "https://accounts.google.com/o/oauth2/v2/auth"
 _authorization_base_url = "https://accounts.google.com/o/oauth2/v2/auth"
 _token_url = "https://www.googleapis.com/oauth2/v4/token"
 _token_url = "https://www.googleapis.com/oauth2/v4/token"

+ 0 - 2
app/dashboard/views/index.py

@@ -2,7 +2,6 @@ from dataclasses import dataclass
 
 
 from flask import render_template, request, redirect, url_for, flash
 from flask import render_template, request, redirect, url_for, flash
 from flask_login import login_required, current_user
 from flask_login import login_required, current_user
-from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm import joinedload
 
 
 from app import alias_utils
 from app import alias_utils
@@ -13,7 +12,6 @@ from app.log import LOG
 from app.models import (
 from app.models import (
     Alias,
     Alias,
     ClientUser,
     ClientUser,
-    DeletedAlias,
     AliasGeneratorEnum,
     AliasGeneratorEnum,
     User,
     User,
     EmailLog,
     EmailLog,

+ 0 - 1
app/oauth/views/authorize.py

@@ -7,7 +7,6 @@ from itsdangerous import SignatureExpired
 
 
 from app.config import EMAIL_DOMAIN
 from app.config import EMAIL_DOMAIN
 from app.dashboard.views.custom_alias import available_suffixes, signer
 from app.dashboard.views.custom_alias import available_suffixes, signer
-from app.email_utils import get_email_domain_part
 from app.extensions import db
 from app.extensions import db
 from app.jose_utils import make_id_token
 from app.jose_utils import make_id_token
 from app.log import LOG
 from app.log import LOG

+ 0 - 2
app/paddle_utils.py

@@ -10,13 +10,11 @@ import collections
 import phpserialize
 import phpserialize
 import requests
 import requests
 from Crypto.Hash import SHA1
 from Crypto.Hash import SHA1
-
 # Crypto can be found at https://pypi.org/project/pycryptodome/
 # Crypto can be found at https://pypi.org/project/pycryptodome/
 from Crypto.PublicKey import RSA
 from Crypto.PublicKey import RSA
 from Crypto.Signature import PKCS1_v1_5
 from Crypto.Signature import PKCS1_v1_5
 
 
 from app.config import PADDLE_PUBLIC_KEY_PATH, PADDLE_VENDOR_ID, PADDLE_AUTH_CODE
 from app.config import PADDLE_PUBLIC_KEY_PATH, PADDLE_VENDOR_ID, PADDLE_AUTH_CODE
-
 # Your Paddle public key.
 # Your Paddle public key.
 from app.log import LOG
 from app.log import LOG
 
 

+ 0 - 2
tests/api/test_alias.py

@@ -2,8 +2,6 @@ import json
 
 
 from flask import url_for
 from flask import url_for
 
 
-from flask import url_for
-
 from app.config import PAGE_LIMIT
 from app.config import PAGE_LIMIT
 from app.extensions import db
 from app.extensions import db
 from app.models import User, ApiKey, Alias, Contact, EmailLog, Mailbox
 from app.models import User, ApiKey, Alias, Contact, EmailLog, Mailbox

+ 1 - 1
tests/api/test_user_info.py

@@ -1,7 +1,7 @@
 from flask import url_for
 from flask import url_for
 
 
 from app.extensions import db
 from app.extensions import db
-from app.models import User, ApiKey, AliasUsedOn, Alias
+from app.models import User, ApiKey
 
 
 
 
 def test_user_in_trial(flask_client):
 def test_user_in_trial(flask_client):

+ 0 - 1
tests/test_models.py

@@ -1,6 +1,5 @@
 from uuid import UUID
 from uuid import UUID
 
 
-import arrow
 import pytest
 import pytest
 
 
 from app.config import EMAIL_DOMAIN, MAX_NB_EMAIL_FREE_PLAN
 from app.config import EMAIL_DOMAIN, MAX_NB_EMAIL_FREE_PLAN