From 75b633a173f217ccd508cf6b5306a3e93f79c2e6 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 18 Oct 2016 20:08:39 -0200 Subject: Adapted imports to reflect new bitmask-dev dependency --- service/pixelated/adapter/mailstore/leap_attachment_store.py | 4 ++-- service/pixelated/adapter/mailstore/leap_mailstore.py | 4 ++-- service/pixelated/adapter/mailstore/maintenance/__init__.py | 4 ++-- service/pixelated/adapter/model/mail.py | 2 +- service/pixelated/adapter/services/mail_sender.py | 2 +- service/pixelated/adapter/services/mail_service.py | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'service/pixelated/adapter') 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 . -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): -- cgit v1.2.3