[refactor] change IMAPAccount signature

for consistency with the previous Account change.

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 0b8e0198..459b0ba1 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 6a2fca85..4663854a 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 ad89e92b..64a03268 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 68804963..754df9f0 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