twilio python changes for orgs api uptake

Author: AsabuHere

twilio/base/client_base.py

@@ -99,8 +99,6 @@ def request(
             if auth_strategy.auth_type == AuthType.TOKEN:
                 auth_strategy.fetch_token()
                 headers["Authorization"] = auth_strategy.get_auth_string()
-            if auth_strategy.auth_type == AuthType.BASIC:
-                headers["Authorization"] = auth_strategy.get_auth_string()
         else:
             auth = self.get_auth(auth)
 
@@ -161,8 +159,6 @@ async def request_async(
             if auth_strategy.auth_type == AuthType.TOKEN:
                 auth_strategy.fetch_token()
                 headers["Authorization"] = auth_strategy.get_auth_string()
-            if auth_strategy.auth_type == AuthType.BASIC:
-                headers["Authorization"] = auth_strategy.get_auth_string()
         else:
             auth = self.get_auth(auth)
 
@@ -262,10 +258,3 @@ def __repr__(self) -> str:
         :returns: Machine friendly representation
         """
         return "<Twilio {}>".format(self.account_sid)
-
-
-def dynamic_import(module_name, class_name):
-    from importlib import import_module
-
-    module = import_module(module_name)
-    return getattr(module, class_name)

twilio/base/exceptions.py

@@ -62,7 +62,7 @@ def get_uri(code: int) -> str:
                 "\n\n{twilio_returned}\n\n{message}\n".format(
                     red_error=red("HTTP Error"),
                     request_was=white("Your request was:"),
-                    http_line=teal("%s %s" % (self.method, self.uri, self.data, self.uri)),
+                    http_line=teal("%s %s" % (self.method, self.uri)),
                     twilio_returned=white("Twilio returned the following information:"),
                     message=blue(str(self.msg)),
                 )

twilio/base/oauth_token_base.py

@@ -447,7 +447,6 @@ def create(
         auth: Optional[Tuple[str, str]] = None,
         timeout: Optional[float] = None,
         allow_redirects: bool = False,
-        is_oauth: bool = False,
     ) -> Any:
         """
         Create a resource instance.
@@ -474,7 +473,6 @@ async def create_async(
         auth: Optional[Tuple[str, str]] = None,
         timeout: Optional[float] = None,
         allow_redirects: bool = False,
-        is_oauth: bool = False,
     ) -> Any:
         """
         Asynchronously create a resource instance.
@@ -488,6 +486,5 @@ async def create_async(
             auth=auth,
             timeout=timeout,
             allow_redirects=allow_redirects,
-            is_oauth=is_oauth,
         )
         return self._parse_create(method, uri, response)

twilio/base/version.py

@@ -31,7 +31,6 @@ def __init__(
         self.client = Client()
 
     def fetch_access_token(self):
-        # token_list = TokenList(version)
         token_instance = self.client.preview_iam.v1.token.create(
             grant_type=self.grant_type,
             client_id=self.client_id,

twilio/http/no_auth_http_client.py

@@ -112,7 +112,6 @@ def __init__(
         :returns: Twilio Client
         :rtype: twilio.rest.Client
         """
-
         super().__init__(
             username,
             password,

twilio/http/orgs_token_manager.py

@@ -35,14 +35,9 @@ def __init__(self, domain: Domain):
     @property
     def accounts(self) -> AccountList:
         if self._accounts is None:
-            self._accounts = AccountList(self, organization_sid="OR64adedc0f4dc99b9113305f725677b47")
+            self._accounts = AccountList(self)
         return self._accounts
 
-    # @property
-    # def accounts(self, organization_sid) -> AccountList:
-    #     if self._accounts is None:
-    #         self._accounts = AccountList(self, "OR64adedc0f4dc99b9113305f725677b47")
-    #     return self._accounts
 
     @property
     def role_assignments(self) -> RoleAssignmentList: