anas/spotipy
1
0
Fork 0
mirror of https://github.com/spotipy-dev/spotipy.git synced 2026-06-19 09:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix exception is raised in exception handler, fixes #403

Browse Source
This commit is contained in:
Stephane Bruckert 2020-02-16 12:37:52 +00:00
parent 76522dfd1e
commit 125267fa4e
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
spotipy/client.py
View File

@ -187,39 +187,22 @@ class Spotify(object):
if args: if args:
kwargs.update(args) kwargs.update(args)
retries = self.max_get_retries retries = self.max_get_retries
delay = 1 delay = 0
while retries > 0: while retries > 0:
try: try:
return self._internal_call("GET", url, payload, kwargs) return self._internal_call("GET", url, payload, kwargs)
except SpotifyException as e: except SpotifyException as e:
retries -= 1 retries -= 1
delay += 1
status = e.http_status status = e.http_status
# 429 means we hit a rate limit, backoff # 429 means we hit a rate limit, back-off
if status == 429 or (status >= 500 and status < 600): if not (status == 429 or status >= 500 and status < 600):
if retries < 0:
raise
else:
sleep_seconds = int(
e.headers.get("Retry-After", delay)
)
print("retrying ..." + str(sleep_seconds) + "secs")
time.sleep(sleep_seconds + 1)
delay += 1
else:
raise
except Exception as e:
raise
print("exception", str(e))
# some other exception. Requests have
# been know to throw a BadStatusLine exception
retries -= 1
if retries >= 0:
sleep_seconds = int(e.headers.get("Retry-After", delay))
print("retrying ..." + str(delay) + "secs")
time.sleep(sleep_seconds + 1)
delay += 1
else:
raise raise
sleep_seconds = int(
e.headers.get("Retry-After", delay)
)
print("retrying after..." + str(sleep_seconds) + "secs")
time.sleep(sleep_seconds + 1)
def _post(self, url, args=None, payload=None, **kwargs): def _post(self, url, args=None, payload=None, **kwargs):
if args: if args: