Skip to content
This repository was archived by the owner on May 9, 2020. It is now read-only.

Update api.py to raise for bad HTTP status codes #52

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ docs/_build/
build
dist
.venv

.eggs/
23 changes: 16 additions & 7 deletions chef/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ def __exit__(self, type, value, traceback):
del api_stack_value()[-1]

def _request(self, method, url, data, headers):
request = requests.api.request(method, url, headers=headers, data=data, verify=self.ssl_verify)
return request
response = requests.api.request(method, url, headers=headers, data=data, verify=self.ssl_verify)
return response

def request(self, method, path, headers={}, data=None):
auth_headers = sign_request(key=self.key, http_method=method,
Expand All @@ -201,14 +201,23 @@ def request(self, method, path, headers={}, data=None):
try:
response = self._request(method, self.url + path, data, dict(
(k.capitalize(), v) for k, v in six.iteritems(request_headers)))
except six.moves.urllib.error.HTTPError as e:
e.content = e.read()
response.raise_for_status()
except six.moves.urllib.error.HTTPError as uhe:
uhe.content = uhe.read()
try:
e.content = json.loads(e.content.decode())
raise ChefServerError.from_error(e.content['error'], code=e.code)
uhe.content = json.loads(uhe.content.decode())
raise ChefServerError.from_error(uhe.content['error'], code=uhe.code)
except ValueError:
pass
raise e
raise uhe
except requests.exceptions.HTTPError as rhe:
try:
content = response.json()
raise ChefServerError.from_error(content['error'], code=rhe.response.status_code)
except ValueError:
pass
raise rhe

return response

def api_request(self, method, path, headers={}, data=None):
Expand Down