summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-15 16:06:56 -0400
committerKali Kaneko <kali@leap.se>2016-04-15 16:11:18 -0400
commit16dc639511e0a87ad83b6b4a161586c3a17b6bf8 (patch)
treecdf0181b11c65ee7bfd9321c2244b28dbb450130
parentc5980d0be3732f30bcbcd6a7742ad56ee3d48cd7 (diff)
[refactor] change IMAPAccount signature
for consistency with the previous Account change.
-rw-r--r--mail/src/leap/mail/imap/account.py7
-rw-r--r--mail/src/leap/mail/imap/service/imap.py2
-rw-r--r--mail/src/leap/mail/imap/tests/utils.py2
-rw-r--r--mail/src/leap/mail/incoming/tests/test_incoming_mail.py2
4 files changed, 7 insertions, 6 deletions
diff --git a/mail/src/leap/mail/imap/account.py b/mail/src/leap/mail/imap/account.py
index 0b8e019..459b0ba 100644
--- a/mail/src/leap/mail/imap/account.py
+++ b/mail/src/leap/mail/imap/account.py
@@ -60,7 +60,7 @@ class IMAPAccount(object):
selected = None
- def __init__(self, user_id, store, d=defer.Deferred()):
+ def __init__(self, store, user_id, d=defer.Deferred()):
"""
Keeps track of the mailboxes and subscriptions handled by this account.
@@ -69,12 +69,13 @@ class IMAPAccount(object):
You can either pass a deferred to this constructor, or use
`callWhenReady` method.
+ :param store: a Soledad instance.
+ :type store: Soledad
+
:param user_id: The identifier of the user this account belongs to
(user id, in the form user@provider).
:type user_id: str
- :param store: a Soledad instance.
- :type store: Soledad
:param d: a deferred that will be fired with this IMAPAccount instance
when the account is ready to be used.
diff --git a/mail/src/leap/mail/imap/service/imap.py b/mail/src/leap/mail/imap/service/imap.py
index 6a2fca8..4663854 100644
--- a/mail/src/leap/mail/imap/service/imap.py
+++ b/mail/src/leap/mail/imap/service/imap.py
@@ -73,7 +73,7 @@ class LocalSoledadIMAPRealm(object):
def gotSoledad(soledad):
for iface in interfaces:
if iface is IAccount:
- avatar = IMAPAccount(avatarId, soledad)
+ avatar = IMAPAccount(soledad, avatarId)
return (IAccount, avatar,
getattr(avatar, 'logout', lambda: None))
raise NotImplementedError(self, interfaces)
diff --git a/mail/src/leap/mail/imap/tests/utils.py b/mail/src/leap/mail/imap/tests/utils.py
index ad89e92..64a0326 100644
--- a/mail/src/leap/mail/imap/tests/utils.py
+++ b/mail/src/leap/mail/imap/tests/utils.py
@@ -158,7 +158,7 @@ class IMAP4HelperMixin(SoledadTestMixin):
self._soledad.sync = Mock()
d = defer.Deferred()
- self.acc = IMAPAccount(USERID, self._soledad, d=d)
+ self.acc = IMAPAccount(self._soledad, USERID, d=d)
return d
d = super(IMAP4HelperMixin, self).setUp()
diff --git a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
index 6880496..754df9f 100644
--- a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
+++ b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
@@ -77,7 +77,7 @@ subject: independence of cyberspace
def setUp(self):
def getInbox(_):
d = defer.Deferred()
- theAccount = IMAPAccount(ADDRESS, self._soledad, d=d)
+ theAccount = IMAPAccount(self._soledad, ADDRESS, d=d)
d.addCallback(
lambda _: theAccount.getMailbox(INBOX_NAME))
return d