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/mail/imap/service/imap-server.tac | |
| parent | 2a46b146135aa5694eb9de288c24037051268fdf (diff) | |
[refactor] fix imports after merging submodules
Diffstat (limited to 'src/leap/bitmask/mail/imap/service/imap-server.tac')
| -rw-r--r-- | src/leap/bitmask/mail/imap/service/imap-server.tac | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/leap/bitmask/mail/imap/service/imap-server.tac b/src/leap/bitmask/mail/imap/service/imap-server.tac index c4d602d..685db6b 100644 --- a/src/leap/bitmask/mail/imap/service/imap-server.tac +++ b/src/leap/bitmask/mail/imap/service/imap-server.tac @@ -28,19 +28,18 @@ userid = 'user@provider' uuid = 'deadbeefdeadabad' passwd = 'supersecret' # optional, will get prompted if not found. """ - # TODO -- this .tac file should be deprecated in favor of bitmask.core.bitmaskd - import ConfigParser import getpass import os import sys -from leap.keymanager import KeyManager -from leap.mail.imap.service import imap +from twisted.application import service, internet + +from leap.bitmask.keymanager import KeyManager +from leap.bitmask.mail.imap.service import imap from leap.soledad.client import Soledad -from twisted.application import service, internet # TODO should get this initializers from some authoritative mocked source |