Change arg order for access tokens

jingming · jingming · commit c261b9d5de83 · 2015-11-06T16:14:49.000-08:00
diff --git a/tests/test_access_token.py b/tests/test_access_token.py
@@ -26,7 +26,7 @@ def _validate_claims(self, payload):
         assert_is_not_none(payload['grants'])
 
     def test_empty_grants(self):
-        scat = AccessToken(SIGNING_KEY_SID, ACCOUNT_SID, 'secret')
+        scat = AccessToken(ACCOUNT_SID, SIGNING_KEY_SID, 'secret')
         token = str(scat)
 
         assert_is_not_none(token)
@@ -35,7 +35,7 @@ def test_empty_grants(self):
         assert_equal({}, payload['grants'])
 
     def test_conversations_grant(self):
-        scat = AccessToken(SIGNING_KEY_SID, ACCOUNT_SID, 'secret')
+        scat = AccessToken(ACCOUNT_SID, SIGNING_KEY_SID, 'secret')
         scat.add_grant(ConversationGrant())
 
         token = str(scat)
@@ -46,7 +46,7 @@ def test_conversations_grant(self):
         assert_equal({}, payload['grants']['rtc'])
 
     def test_ip_messaging_grant(self):
-        scat = AccessToken(SIGNING_KEY_SID, ACCOUNT_SID, 'secret')
+        scat = AccessToken(ACCOUNT_SID, SIGNING_KEY_SID, 'secret')
         scat.add_grant(IpMessagingGrant())
 
         token = str(scat)
@@ -57,7 +57,7 @@ def test_ip_messaging_grant(self):
         assert_equal({}, payload['grants']['ip_messaging'])
 
     def test_grants(self):
-        scat = AccessToken(SIGNING_KEY_SID, ACCOUNT_SID, 'secret')
+        scat = AccessToken(ACCOUNT_SID, SIGNING_KEY_SID, 'secret')
         scat.add_grant(ConversationGrant())
         scat.add_grant(IpMessagingGrant())
 
diff --git a/twilio/access_token.py b/twilio/access_token.py
@@ -45,10 +45,10 @@ def to_payload(self):
 
 
 class AccessToken(object):
-    def __init__(self, signing_key_sid, account_sid, secret,
+    def __init__(self, account_sid, signing_key_sid, secret,
                  identity=None, ttl=3600):
-        self.signing_key_sid = signing_key_sid
         self.account_sid = account_sid
+        self.signing_key_sid = signing_key_sid
         self.secret = secret
 
         self.identity = identity
