diff options
author | Bruno Wagner <bwagner@riseup.net> | 2016-10-18 20:08:39 -0200 |
---|---|---|
committer | Bruno Wagner <bwagner@riseup.net> | 2016-10-18 20:08:39 -0200 |
commit | 75b633a173f217ccd508cf6b5306a3e93f79c2e6 (patch) | |
tree | e60df5221e5ab15264571bf52233c385a142b49a /service/pixelated/adapter/mailstore | |
parent | 9356d5c3d4e940e5d4ebf1c851a16b43374a6bc3 (diff) |
Adapted imports to reflect new bitmask-dev dependency
Diffstat (limited to 'service/pixelated/adapter/mailstore')
3 files changed, 6 insertions, 6 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 |