Improve #1092 #1084 by removing mutable method default arguments (#1093)

Author: seratch

slack_sdk/audit_logs/v1/async_client.py

@@ -55,7 +55,7 @@ def __init__(
         user_agent_prefix: Optional[str] = None,
         user_agent_suffix: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[AsyncRetryHandler] = async_default_handlers(),
+        retry_handlers: Optional[List[AsyncRetryHandler]] = None,
     ):
         """API client for Audit Logs API
         See https://api.slack.com/admins/audit-logs for more details
@@ -88,7 +88,9 @@ def __init__(
             user_agent_prefix, user_agent_suffix
         )
         self.logger = logger if logger is not None else logging.getLogger(__name__)
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else async_default_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self.logger)

slack_sdk/audit_logs/v1/client.py

@@ -50,7 +50,7 @@ def __init__(
         user_agent_prefix: Optional[str] = None,
         user_agent_suffix: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[RetryHandler] = default_retry_handlers(),
+        retry_handlers: Optional[List[RetryHandler]] = None,
     ):
         """API client for Audit Logs API
         See https://api.slack.com/admins/audit-logs for more details
@@ -77,7 +77,9 @@ def __init__(
             user_agent_prefix, user_agent_suffix
         )
         self.logger = logger if logger is not None else logging.getLogger(__name__)
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else default_retry_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self.logger)

slack_sdk/http_retry/builtin_handlers.py

@@ -56,7 +56,7 @@ def _can_retry(
         response: Optional[HttpResponse] = None,
         error: Optional[Exception] = None,
     ) -> bool:
-        return response.status_code == 429
+        return response is not None and response.status_code == 429
 
     def prepare_for_next_attempt(
         self,

slack_sdk/scim/v1/async_client.py

@@ -70,7 +70,7 @@ def __init__(
         user_agent_prefix: Optional[str] = None,
         user_agent_suffix: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[AsyncRetryHandler] = async_default_handlers(),
+        retry_handlers: Optional[List[AsyncRetryHandler]] = None,
     ):
         """API client for SCIM API
         See https://api.slack.com/scim for more details
@@ -103,7 +103,9 @@ def __init__(
             user_agent_prefix, user_agent_suffix
         )
         self.logger = logger if logger is not None else logging.getLogger(__name__)
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else async_default_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self.logger)

slack_sdk/scim/v1/client.py

@@ -72,7 +72,7 @@ def __init__(
         user_agent_prefix: Optional[str] = None,
         user_agent_suffix: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[RetryHandler] = default_retry_handlers(),
+        retry_handlers: Optional[List[RetryHandler]] = None,
     ):
         """API client for SCIM API
         See https://api.slack.com/scim for more details
@@ -99,7 +99,9 @@ def __init__(
             user_agent_prefix, user_agent_suffix
         )
         self.logger = logger if logger is not None else logging.getLogger(__name__)
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else default_retry_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self.logger)

slack_sdk/web/async_base_client.py

@@ -41,7 +41,7 @@ def __init__(
         # for Org-Wide App installation
         team_id: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[RetryHandler] = async_default_handlers(),
+        retry_handlers: Optional[List[RetryHandler]] = None,
     ):
         self.token = None if token is None else token.strip()
         self.base_url = base_url
@@ -59,7 +59,9 @@ def __init__(
         if team_id is not None:
             self.default_params["team_id"] = team_id
         self._logger = logger if logger is not None else logging.getLogger(__name__)
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else async_default_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self._logger)

slack_sdk/web/base_client.py

@@ -54,7 +54,7 @@ def __init__(
         # for Org-Wide App installation
         team_id: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[RetryHandler] = default_retry_handlers(),
+        retry_handlers: Optional[List[RetryHandler]] = None,
     ):
         self.token = None if token is None else token.strip()
         self.base_url = base_url
@@ -70,7 +70,9 @@ def __init__(
             self.default_params["team_id"] = team_id
         self._logger = logger if logger is not None else logging.getLogger(__name__)
 
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else default_retry_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self._logger)

slack_sdk/webhook/async_client.py

@@ -49,7 +49,7 @@ def __init__(
         user_agent_prefix: Optional[str] = None,
         user_agent_suffix: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[AsyncRetryHandler] = async_default_handlers(),
+        retry_handlers: Optional[List[AsyncRetryHandler]] = None,
     ):
         """API client for Incoming Webhooks and `response_url`
 
@@ -80,7 +80,9 @@ def __init__(
             user_agent_prefix, user_agent_suffix
         )
         self.logger = logger if logger is not None else logging.getLogger(__name__)
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else async_default_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self.logger)

slack_sdk/webhook/client.py

@@ -44,7 +44,7 @@ def __init__(
         user_agent_prefix: Optional[str] = None,
         user_agent_suffix: Optional[str] = None,
         logger: Optional[logging.Logger] = None,
-        retry_handlers: List[RetryHandler] = default_retry_handlers(),
+        retry_handlers: Optional[List[RetryHandler]] = None,
     ):
         """API client for Incoming Webhooks and `response_url`
 
@@ -70,7 +70,9 @@ def __init__(
             user_agent_prefix, user_agent_suffix
         )
         self.logger = logger if logger is not None else logging.getLogger(__name__)
-        self.retry_handlers = retry_handlers
+        self.retry_handlers = (
+            retry_handlers if retry_handlers is not None else default_retry_handlers()
+        )
 
         if self.proxy is None or len(self.proxy.strip()) == 0:
             env_variable = load_http_proxy_from_env(self.logger)

tests/slack_sdk/audit_logs/test_client_http_retry.py

@@ -35,8 +35,8 @@ def test_rate_limited(self):
         client = AuditLogsClient(
             token="xoxp-ratelimited",
             base_url="http://localhost:8888/",
-            retry_handlers=[RateLimitErrorRetryHandler()],
         )
+        client.retry_handlers.append(RateLimitErrorRetryHandler())
 
         response = client.actions()
         # Just running retries; no assertions for call count so far