diff options
| author | Kali Kaneko <kali@leap.se> | 2015-02-11 14:06:53 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-02-11 14:06:53 -0400 |
| commit | 0c52d5d8b4ec9c01c5308c8e9de329879d7d3027 (patch) | |
| tree | 40ccbf608214aab028283a13be0914378207329d /src/leap/bitmask/services/mail/plumber.py | |
| parent | 91f0a38f5911d0f26210f62a94ab46e741e30189 (diff) | |
| parent | 965d8a6bd4646fe6cc285e18355bbe2ce514b73b (diff) | |
Merge branch 'feature/async-api' into develop
Diffstat (limited to 'src/leap/bitmask/services/mail/plumber.py')
| -rw-r--r-- | src/leap/bitmask/services/mail/plumber.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/leap/bitmask/services/mail/plumber.py b/src/leap/bitmask/services/mail/plumber.py index 1af65c5d..58625db5 100644 --- a/src/leap/bitmask/services/mail/plumber.py +++ b/src/leap/bitmask/services/mail/plumber.py @@ -17,6 +17,8 @@ """ Utils for manipulating local mailboxes. """ +# TODO --- this module has not yet catched up with 0.9.0 + import getpass import logging import os @@ -32,9 +34,7 @@ from leap.bitmask.provider import get_provider_path from leap.bitmask.services.soledad.soledadbootstrapper import get_db_paths from leap.bitmask.util import flatten, get_path_prefix -from leap.mail.imap.account import SoledadBackedAccount -from leap.mail.imap.memorystore import MemoryStore -from leap.mail.imap.soledadstore import SoledadStore +from leap.mail.imap.account import IMAPAccount from leap.soledad.client import Soledad logger = logging.getLogger(__name__) @@ -140,11 +140,7 @@ class MBOXPlumber(object): self.sol = initialize_soledad( self.uuid, self.userid, self.passwd, secrets, localdb, "/tmp", "/tmp") - memstore = MemoryStore( - permanent_store=SoledadStore(self.sol), - write_period=5) - self.acct = SoledadBackedAccount(self.userid, self.sol, - memstore=memstore) + self.acct = IMAPAccount(self.userid, self.sol) return True # |