From 662aed784218a45efbf563ff6150fcb9f1aa81aa Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Thu, 1 Sep 2016 00:12:28 -0400 Subject: [refactor] fix imports after merging submodules --- src/leap/bitmask/core/mail_services.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/leap/bitmask/core/mail_services.py') diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index 68cb444a..72a3512c 100644 --- a/src/leap/bitmask/core/mail_services.py +++ b/src/leap/bitmask/core/mail_services.py @@ -29,17 +29,19 @@ from twisted.application import service from twisted.internet import defer from twisted.python import log -from leap.bonafide import config +# TODO move to bitmask.common from leap.common.service_hooks import HookableService -from leap.keymanager import KeyManager -from leap.keymanager.errors import KeyNotFound -from leap.keymanager.validation import ValidationLevels +from leap.bitmask.bonafide import config +from leap.bitmask.keymanager import KeyManager +from leap.bitmask.keymanager.errors import KeyNotFound +from leap.bitmask.keymanager.validation import ValidationLevels +from leap.bitmask.mail.constants import INBOX_NAME +from leap.bitmask.mail.mail import Account +from leap.bitmask.mail.imap.service import imap +from leap.bitmask.mail.incoming.service import IncomingMail +from leap.bitmask.mail.incoming.service import INCOMING_CHECK_PERIOD +from leap.bitmask.mail import smtp from leap.soledad.client.api import Soledad -from leap.mail.constants import INBOX_NAME -from leap.mail.mail import Account -from leap.mail.imap.service import imap -from leap.mail.incoming.service import IncomingMail, INCOMING_CHECK_PERIOD -from leap.mail import smtp from leap.bitmask.core.uuid_map import UserMap from leap.bitmask.core.configurable import DEFAULT_BASEDIR -- cgit v1.2.3