Adapted imports to reflect new bitmask-dev dependency

9 files changed, 15 insertions, 15 deletions

diff --git a/service/pixelated/adapter/mailstore/leap_attachment_store.py b/service/pixelated/adapter/mailstore/leap_attachment_store.py
index 982d9222..c95b776a 100644
--- a/service/pixelated/adapter/mailstore/leap_attachment_store.py
+++ b/service/pixelated/adapter/mailstore/leap_attachment_store.py
@@ -2,11 +2,11 @@
 import quopri
 import base64
 from email import encoders
-from leap.mail.adaptors.soledad import SoledadMailAdaptor, ContentDocWrapper
+from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor, ContentDocWrapper
 from twisted.internet import defer
 from email.mime.nonmultipart import MIMENonMultipart
 from email.mime.multipart import MIMEMultipart
-from leap.mail.mail import Message
+from leap.bitmask.mail.mail import Message
 
 
 class LeapAttachmentStore(object):
diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py
index 97c95a90..900a7cbb 100644
--- a/service/pixelated/adapter/mailstore/leap_mailstore.py
+++ b/service/pixelated/adapter/mailstore/leap_mailstore.py
@@ -17,8 +17,8 @@ import re
 from email.header import decode_header
 from uuid import uuid4
 
-from leap.mail.adaptors.soledad import SoledadMailAdaptor
-from leap.mail.mail import Message
+from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor
+from leap.bitmask.mail.mail import Message
 from twisted.internet import defer
 from twisted.internet.defer import FirstError, DeferredList
 
diff --git a/service/pixelated/adapter/mailstore/maintenance/__init__.py b/service/pixelated/adapter/mailstore/maintenance/__init__.py
index 2e6c24c6..5dbe57ad 100644
--- a/service/pixelated/adapter/mailstore/maintenance/__init__.py
+++ b/service/pixelated/adapter/mailstore/maintenance/__init__.py
@@ -13,8 +13,8 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from leap.keymanager import documents as leap_doc
-from leap.keymanager.keys import OpenPGPKey
+from leap.bitmask.keymanager import documents as leap_doc
+from leap.bitmask.keymanager.keys import OpenPGPKey
 
 from twisted.internet import defer
 import logging
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index 18be9362..86f2642a 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -22,7 +22,7 @@ from hashlib import sha256
 import binascii
 from email.MIMEMultipart import MIMEMultipart
 from email.mime.nonmultipart import MIMENonMultipart
-import leap.mail.walk as walk
+import leap.bitmask.mail.walk as walk
 from pixelated.adapter.model.status import Status
 from pixelated.support import date
 
diff --git a/service/pixelated/adapter/services/mail_sender.py b/service/pixelated/adapter/services/mail_sender.py
index b7b5bfe6..9e506c34 100644
--- a/service/pixelated/adapter/services/mail_sender.py
+++ b/service/pixelated/adapter/services/mail_sender.py
@@ -16,7 +16,7 @@
 from StringIO import StringIO
 from email.utils import parseaddr
 from copy import deepcopy
-from leap.mail.outgoing.service import OutgoingMail
+from leap.bitmask.mail.outgoing.service import OutgoingMail
 
 from twisted.internet.defer import Deferred, fail
 from twisted.mail.smtp import SMTPSenderFactory
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 1dce51fe..e5343997 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -16,14 +16,14 @@
 from email import encoders
 from email.mime.nonmultipart import MIMENonMultipart
 from email.mime.multipart import MIMEMultipart
-from leap.mail.mail import Message
+from leap.bitmask.mail.mail import Message
 
 from twisted.internet import defer
 
 from pixelated.adapter.model.mail import InputMail
 from pixelated.adapter.model.status import Status
 from pixelated.adapter.services.tag_service import extract_reserved_tags
-from leap.mail.adaptors.soledad import SoledadMailAdaptor
+from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor
 
 
 class MailService(object):
diff --git a/service/pixelated/bitmask_libraries/keymanager.py b/service/pixelated/bitmask_libraries/keymanager.py
index dddc744e..56b7d944 100644
--- a/service/pixelated/bitmask_libraries/keymanager.py
+++ b/service/pixelated/bitmask_libraries/keymanager.py
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from leap.keymanager import KeyManager, KeyNotFound
+from leap.bitmask.keymanager import KeyManager, KeyNotFound
 from pixelated.config import leap_config
 from twisted.internet import defer
 import logging
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py
index d38e7b4f..2d186da5 100644
--- a/service/pixelated/config/sessions.py
+++ b/service/pixelated/config/sessions.py
@@ -12,8 +12,8 @@ from twisted.internet import defer, threads, reactor
 from leap.soledad.common.crypto import WrongMacError, UnknownMacMethodError
 from leap.soledad.client import Soledad
 from pixelated.bitmask_libraries.keymanager import Keymanager
-from leap.mail.incoming.service import IncomingMail
-from leap.mail.mail import Account
+from leap.bitmask.mail.incoming.service import IncomingMail
+from leap.bitmask.mail.mail import Account
 import leap.common.certs as leap_certs
 from leap.common.events import (
     register, unregister,
diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py
index 3b216304..6807d9bc 100644
--- a/service/pixelated/maintenance.py
+++ b/service/pixelated/maintenance.py
@@ -18,7 +18,7 @@ from os.path import isfile
 from mailbox import Maildir, mbox, MaildirMessage
 import random
 
-from leap.mail.adaptors.soledad import MetaMsgDocWrapper
+from leap.bitmask.mail.adaptors.soledad import MetaMsgDocWrapper
 from twisted.internet import reactor, defer
 from twisted.internet.threads import deferToThread
 from pixelated.adapter.mailstore.maintenance import SoledadMaintenance
@@ -26,7 +26,7 @@ from pixelated.config.leap import initialize_leap_single_user
 from pixelated.config import logger, arguments
 import logging
 
-from leap.mail.constants import MessageFlags
+from leap.bitmask.mail.constants import MessageFlags
 from pixelated.support.mail_generator import MailGenerator
 
 REPAIR_COMMAND = 'repair'