openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Convert requests.ConnectionError to ClientException"

Browse Source
This commit is contained in:
Jenkins
2013-04-18 05:54:17 +00:00
committed by Gerrit Code Review
parent aaf3aa977f dca30fbb93
commit e7e35f716b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
keystoneclient/client.py
View File

@@ -351,11 +351,16 @@ class HTTPClient(object):
request_kwargs.setdefault('timeout', self.timeout) request_kwargs.setdefault('timeout', self.timeout)
self.http_log_req((url, method,), request_kwargs) self.http_log_req((url, method,), request_kwargs)
resp = requests.request(
method, try:
url, resp = requests.request(
verify=self.verify_cert, method,
**request_kwargs) url,
verify=self.verify_cert,
**request_kwargs)
except requests.ConnectionError:
msg = 'Unable to establish connection to %s' % url
raise exceptions.ClientException(msg)
self.http_log_resp(resp) self.http_log_resp(resp)