diff options
| author | Max Wittig <max.wittig@siemens.com> | 2022-04-14 19:36:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 19:36:34 +0200 |
| commit | ba7692aee2f11b502565dd2c4b46aa99772c2ca7 (patch) | |
| tree | cded06501cbfd774f1ce0499cb78a93154d6e360 | |
| parent | 07a16af33c6d1965dae860d1e604ce36e42d8d87 (diff) | |
| parent | 34318871347b9c563d01a13796431c83b3b1d58c (diff) | |
| download | gitlab-ba7692aee2f11b502565dd2c4b46aa99772c2ca7.tar.gz | |
Merge pull request #1965 from python-gitlab/fix/redundant-args-api
fix: avoid passing redundant arguments to API
| -rw-r--r-- | gitlab/client.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gitlab/client.py b/gitlab/client.py index 0f61a17..b8ac222 100644 --- a/gitlab/client.py +++ b/gitlab/client.py @@ -63,8 +63,8 @@ class Gitlab: pagination: Can be set to 'keyset' to use keyset pagination order_by: Set order_by globally user_agent: A custom user agent to use for making HTTP requests. - retry_transient_errors: Whether to retry after 500, 502, 503, or - 504 responses. Defaults to False. + retry_transient_errors: Whether to retry after 500, 502, 503, 504 + or 52x responses. Defaults to False. """ def __init__( @@ -624,6 +624,7 @@ class Gitlab: files: Optional[Dict[str, Any]] = None, timeout: Optional[float] = None, obey_rate_limit: bool = True, + retry_transient_errors: Optional[bool] = None, max_retries: int = 10, **kwargs: Any, ) -> requests.Response: @@ -642,6 +643,8 @@ class Gitlab: timeout: The timeout, in seconds, for the request obey_rate_limit: Whether to obey 429 Too Many Request responses. Defaults to True. + retry_transient_errors: Whether to retry after 500, 502, 503, 504 + or 52x responses. Defaults to False. max_retries: Max retries after 429 or transient errors, set to -1 to retry forever. Defaults to 10. **kwargs: Extra options to send to the server (e.g. sudo) @@ -679,14 +682,13 @@ class Gitlab: # If timeout was passed into kwargs, allow it to override the default if timeout is None: timeout = opts_timeout + if retry_transient_errors is None: + retry_transient_errors = self.retry_transient_errors # We need to deal with json vs. data when uploading files json, data, content_type = self._prepare_send_data(files, post_data, raw) opts["headers"]["Content-type"] = content_type - retry_transient_errors = kwargs.get( - "retry_transient_errors", self.retry_transient_errors - ) cur_retries = 0 while True: try: |