clean the error handling,

now obp use the new error format
This commit is contained in:
hongwei 2020-03-30 11:26:57 +02:00
parent bace82c84f
commit 4d0025ce1f

View File

@ -104,17 +104,17 @@ class API(object):
response = self.call('PUT', url, payload)
return self.handle_response(response)
def handle_response_404(self, response, prefix):
msg = '{} {}: {}'.format(
prefix, response.status_code, response.text)
log(logging.ERROR, msg)
raise APIError(msg)
def handle_response_500(self, response, prefix):
msg = '{} {}: {}'.format(
prefix, response.status_code, response.text)
log(logging.ERROR, msg)
raise APIError(msg)
# def handle_response_404(self, response, prefix):
# msg = '{} {}: {}'.format(
# prefix, response.status_code, response.text)
# log(logging.ERROR, msg)
# raise APIError(msg)
#
# def handle_response_500(self, response, prefix):
# msg = '{} {}: {}'.format(
# prefix, response.status_code, response.text)
# log(logging.ERROR, msg)
# raise APIError(msg)
def handle_response_error(self, prefix, error):
if 'Invalid or expired access token' in error:
@ -125,17 +125,17 @@ class API(object):
def handle_response(self, response):
"""Handles the response, e.g. errors or conversion to JSON"""
prefix = 'APIError'
if response.status_code == 404:
self.handle_response_404(response, prefix)
elif response.status_code == 500:
self.handle_response_500(response, prefix)
elif response.status_code in [204]:
return response.text
else:
data = response.json()
if isinstance(data,dict) and 'error' in data:
self.handle_response_error(prefix, data['error'])
return data
# if response.status_code == 404:
# self.handle_response_404(response, prefix)
# elif response.status_code == 500:
# self.handle_response_500(response, prefix)
# elif response.status_code in [204]:
# return response.text
# else:
data = response.json()
if isinstance(data,dict) and 'error' in data:
self.handle_response_error(prefix, data['error'])
return data
def start_session(self, session_data):
"""