diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-01 00:12:28 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-01 00:52:34 -0400 |
| commit | 662aed784218a45efbf563ff6150fcb9f1aa81aa (patch) | |
| tree | 9ac2f47fb24f50d3ada1a4a4a0819d6ef909901e /src/leap/bitmask/core | |
| parent | 2a46b146135aa5694eb9de288c24037051268fdf (diff) | |
[refactor] fix imports after merging submodules
Diffstat (limited to 'src/leap/bitmask/core')
| -rw-r--r-- | src/leap/bitmask/core/mail_services.py | 20 | ||||
| -rw-r--r-- | src/leap/bitmask/core/service.py | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index 68cb444..72a3512 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 diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py index 99132c2..79465a8 100644 --- a/src/leap/bitmask/core/service.py +++ b/src/leap/bitmask/core/service.py @@ -35,7 +35,7 @@ backend = flags.BACKEND if backend == 'default': from leap.bitmask.core import mail_services - from leap.bonafide.service import BonafideService + from leap.bitmask.bonafide.service import BonafideService elif backend == 'dummy': from leap.bitmask.core.dummy import mail_services from leap.bitmask.core.dummy import BonafideService |