From e02d95216f3e2afc47dc42d02cece801b2b8ad4e Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sat, 13 Mar 2021 15:46:12 +0100 Subject: [PATCH] Remove unused imports and var assignments --- job_runner.py | 17 +---------------- tests/api/test_import_export.py | 15 +++++---------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/job_runner.py b/job_runner.py index 1ad6b8a2..c0ee9651 100644 --- a/job_runner.py +++ b/job_runner.py @@ -2,13 +2,10 @@ Run scheduled jobs. Not meant for running job at precise time (+- 1h) """ -import csv import time import arrow -import requests -from app import s3 from app.config import ( JOB_ONBOARDING_1, JOB_ONBOARDING_2, @@ -18,23 +15,11 @@ from app.config import ( from app.email_utils import ( send_email, render, - get_email_domain_part, ) from app.import_utils import handle_batch_import -from app.utils import sanitize_email from app.extensions import db from app.log import LOG -from app.models import ( - User, - Job, - BatchImport, - Alias, - DeletedAlias, - DomainDeletedAlias, - CustomDomain, - Mailbox, - AliasMailbox, -) +from app.models import User, Job, BatchImport from server import create_app diff --git a/tests/api/test_import_export.py b/tests/api/test_import_export.py index c37de454..c5ee865d 100644 --- a/tests/api/test_import_export.py +++ b/tests/api/test_import_export.py @@ -8,12 +8,9 @@ from app.models import ( Mailbox, Alias, AliasMailbox, - ApiKey, - File, BatchImport, ) from app.import_utils import import_from_csv -from app.utils import random_string from tests.utils import login @@ -56,7 +53,7 @@ def test_export(flask_client): db.session.commit() # Create aliases - alias1 = Alias.create( + Alias.create( user_id=user1.id, email="ebay@my-domain.com", note="Used on eBay", @@ -68,7 +65,7 @@ def test_export(flask_client): note="Used on Facebook, Instagram.", mailbox_id=mailbox1.id, ) - alias3 = Alias.create( + Alias.create( user_id=user2.id, email="notmine@my-domain.com", note="Should not appear", @@ -77,7 +74,7 @@ def test_export(flask_client): db.session.commit() # Add second mailbox to an alias - alias_mailbox = AliasMailbox.create( + AliasMailbox.create( alias_id=alias2.id, mailbox_id=mailbox2.id, ) @@ -172,10 +169,8 @@ def test_import(flask_client): assert len(Alias.filter_by(user_id=user.id).all()) == 1 # Onboarding alias # Create domains - domain1 = CustomDomain.create( - user_id=user.id, domain="my-domain.com", verified=True - ) - domain2 = CustomDomain.create( + CustomDomain.create(user_id=user.id, domain="my-domain.com", verified=True) + CustomDomain.create( user_id=user.id, domain="my-destination-domain.com", verified=True ) db.session.commit()