Skip to content

Commit

Permalink
Merge cffb434 into 5b0b4da
Browse files Browse the repository at this point in the history
  • Loading branch information
mansimarkaur committed Oct 27, 2016
2 parents 5b0b4da + cffb434 commit f58d425
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions kinto_http/session.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import time
import warnings

import requests
from six.moves.urllib.parse import urlparse
Expand Down Expand Up @@ -69,12 +70,15 @@ def request(self, method, endpoint, data=None, permissions=None,
while retry >= 0:
resp = requests.request(method, actual_url, **kwargs)
retry = retry - 1
headers = resp.headers
if hasattr(headers, "Alert"):
warnings.warn(str(headers['Alert']['message']), DeprecationWarning)
if not (200 <= resp.status_code < 400):
if resp.status_code >= 500 and retry >= 0:
# Wait and try again.
# If not forced, use retry-after header and wait.
if self.retry_after is None:
retry_after = resp.headers.get("Retry-After", 0)
retry_after = headers.get("Retry-After", 0)
else:
retry_after = self.retry_after
time.sleep(retry_after)
Expand All @@ -92,4 +96,4 @@ def request(self, method, endpoint, data=None, permissions=None,
else:
body = resp.json()
# XXX Add the status code.
return body, resp.headers
return body, headers

0 comments on commit f58d425

Please sign in to comment.