diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-31 13:16:27 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-31 13:16:27 -0300 |
| commit | 799757dd9c405b3baab11af0086d9ff5c5f2de7f (patch) | |
| tree | a85b6b350db70812a10b0e611eb8d2a2b3a5faad /src/leap/mail/imap | |
| parent | f307305ae941890a228da8edeed7dfac1e2cc65d (diff) | |
| parent | 4efecad56eae8d777d2fa0d39c4de13b022c7bd6 (diff) | |
Merge remote-tracking branch 'chiiph/bug/refactor_mail_charset' into develop
Diffstat (limited to 'src/leap/mail/imap')
| -rw-r--r-- | src/leap/mail/imap/fetch.py | 2 | ||||
| -rw-r--r-- | src/leap/mail/imap/server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/mail/imap/fetch.py b/src/leap/mail/imap/fetch.py index a776ac7..2775d71 100644 --- a/src/leap/mail/imap/fetch.py +++ b/src/leap/mail/imap/fetch.py @@ -40,7 +40,7 @@ from leap.common.events.events_pb2 import IMAP_MSG_DECRYPTED from leap.common.events.events_pb2 import IMAP_MSG_SAVED_LOCALLY from leap.common.events.events_pb2 import IMAP_MSG_DELETED_INCOMING from leap.common.events.events_pb2 import IMAP_UNREAD_MAIL -from leap.mail.utils import get_email_charset +from leap.common.mail import get_email_charset logger = logging.getLogger(__name__) diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py index 5a98315..9e3e23e 100644 --- a/src/leap/mail/imap/server.py +++ b/src/leap/mail/imap/server.py @@ -34,8 +34,8 @@ from twisted.python import log from leap.common import events as leap_events from leap.common.events.events_pb2 import IMAP_UNREAD_MAIL from leap.common.check import leap_assert, leap_assert_type +from leap.common.mail import get_email_charset from leap.soledad.client import Soledad -from leap.mail.utils import get_email_charset logger = logging.getLogger(__name__) |