Rename account_sid to username and auth_token to password add a new account_sid for none Account Sid auth

matt · matt · commit 31da20b7e804 · 2015-11-16T13:47:58.000-08:00
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -10,6 +10,6 @@ def setUp(self):
         self.account_sid = 'AC' + 'a' * 32
         self.auth_token = 'AUTHTOKEN'
         self.holodeck = Holodeck()
-        self.client = Client(account_sid=self.account_sid,
-                             auth_token=self.auth_token,
+        self.client = Client(username=self.account_sid,
+                             password=self.auth_token,
                              http_client=self.holodeck)
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -23,13 +23,14 @@
 class Client(object):
     """ A client for accessing the Twilio API. """
 
-    def __init__(self, account_sid=None, auth_token=None, http_client=None,
-                 environment=None):
+    def __init__(self, username=None, password=None, account_sid=None,
+                 http_client=None, environment=None):
         """
         Initializes the Twilio Client
         
-        :param str account_sid: Account Sid to authenticate with
-        :param str auth_token: Auth Token to authenticate with
+        :param str username: Username to authenticate with
+        :param str password: Password to authenticate with
+        :param str account_sid: Account Sid, defaults to Username
         :param HttpClient http_client: HttpClient, defaults to Httplib2Client
         :param dict environment: Environment to look for auth details, defaults to os.environ
         
@@ -38,15 +39,17 @@ def __init__(self, account_sid=None, auth_token=None, http_client=None,
         """
         environment = environment or os.environ
         
-        self.account_sid = account_sid or environment.get('TWILIO_ACCOUNT_SID')
+        self.username = username or environment.get('TWILIO_ACCOUNT_SID')
         """ :type : str """
-        self.auth_token = auth_token or environment.get('TWILIO_AUTH_TOKEN')
+        self.password = password or environment.get('TWILIO_AUTH_TOKEN')
+        """ :type : str """
+        self.account_sid = account_sid or self.username
         """ :type : str """
         
-        if not self.account_sid or not self.auth_token:
+        if not self.username or not self.password:
             raise TwilioException("Credentials are required to create a TwilioClient")
         
-        self.auth = (self.account_sid, self.auth_token)
+        self.auth = (self.username, self.password)
         """ :type : tuple(str, str) """
         self.http_client = http_client or Httplib2Client()
         """ :type : HttpClient """
