summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/mail
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-12 18:31:37 +0200
committerKali Kaneko <kali@leap.se>2013-08-12 21:01:51 +0200
commit6920483c29609d233023be8d40130cf6f0030652 (patch)
treec07f70b2e7c2a29cb82f8fd327af5de6ee6ce2da /src/leap/bitmask/services/mail
parent6da8d09846db4d2eed01e488bc6a6f5ba48b959f (diff)
fix imports to use new namespace
Diffstat (limited to 'src/leap/bitmask/services/mail')
-rw-r--r--src/leap/bitmask/services/mail/imap.py4
-rw-r--r--src/leap/bitmask/services/mail/smtpbootstrapper.py8
-rw-r--r--src/leap/bitmask/services/mail/smtpconfig.py2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/leap/bitmask/services/mail/imap.py b/src/leap/bitmask/services/mail/imap.py
index 4dceb2ad..cf93c60e 100644
--- a/src/leap/bitmask/services/mail/imap.py
+++ b/src/leap/bitmask/services/mail/imap.py
@@ -18,10 +18,10 @@
Initialization of imap service
"""
import logging
-import sys
+#import sys
from leap.mail.imap.service import imap
-from twisted.python import log
+#from twisted.python import log
logger = logging.getLogger(__name__)
diff --git a/src/leap/bitmask/services/mail/smtpbootstrapper.py b/src/leap/bitmask/services/mail/smtpbootstrapper.py
index 48040035..0e83424c 100644
--- a/src/leap/bitmask/services/mail/smtpbootstrapper.py
+++ b/src/leap/bitmask/services/mail/smtpbootstrapper.py
@@ -24,12 +24,12 @@ import os
from PySide import QtCore
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.util.request_helpers import get_content
+from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
from leap.common.check import leap_assert, leap_assert_type
from leap.common.files import get_mtime
-from leap.config.providerconfig import ProviderConfig
-from leap.crypto.srpauth import SRPAuth
-from leap.util.request_helpers import get_content
-from leap.services.abstractbootstrapper import AbstractBootstrapper
logger = logging.getLogger(__name__)
diff --git a/src/leap/bitmask/services/mail/smtpconfig.py b/src/leap/bitmask/services/mail/smtpconfig.py
index ea0f9c37..20041c30 100644
--- a/src/leap/bitmask/services/mail/smtpconfig.py
+++ b/src/leap/bitmask/services/mail/smtpconfig.py
@@ -20,8 +20,8 @@ SMTP configuration
"""
import logging
+from leap.bitmask.services.mail.smtpspec import get_schema
from leap.common.config.baseconfig import BaseConfig
-from leap.services.mail.smtpspec import get_schema
logger = logging.getLogger(__name__)