From: Harmon Date: Wed, 6 Jan 2021 01:19:33 +0000 (-0600) Subject: Improve APIMethod.execute check for 420 and 429 HTTP status codes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fd458e9f5749d4fee45f4927871bed6e0da0db0f;p=tweepy.git Improve APIMethod.execute check for 420 and 429 HTTP status codes Also improve formatting and consistency in comment capitalization --- diff --git a/tweepy/binder.py b/tweepy/binder.py index a553a2c..6193a75 100644 --- a/tweepy/binder.py +++ b/tweepy/binder.py @@ -198,15 +198,15 @@ def bind_api(**config): reset_time = resp.headers.get('x-rate-limit-reset') if reset_time is not None: self._reset_time = int(reset_time) - if self.wait_on_rate_limit and self._remaining_calls == 0 and ( - # if ran out of calls before waiting switching retry last call - resp.status_code == 429 or resp.status_code == 420): + if (self.wait_on_rate_limit and self._remaining_calls == 0 + and resp.status_code in (420, 429)): + # If ran out of calls before waiting switching retry last call continue retry_delay = self.retry_delay # Exit request loop if non-retry error code if resp.status_code in (200, 204): break - elif (resp.status_code == 429 or resp.status_code == 420) and self.wait_on_rate_limit: + elif resp.status_code in (420, 429) and self.wait_on_rate_limit: if 'retry-after' in resp.headers: retry_delay = float(resp.headers['retry-after']) elif self.retry_errors and resp.status_code not in self.retry_errors: