openstack/python-cinderclient
Code Issues Proposed changes

Merge "Unsupported 'message' Exception attribute in PY3"

Browse Source
This commit is contained in:
Jenkins
2017-08-29 02:32:00 +00:00
committed by Gerrit Code Review
parent 96dd3391a2 7b601bdb2f
commit b372fe6927
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cinderclient/client.py
View File

@@ -217,7 +217,7 @@ class SessionClient(adapter.LegacyJsonAdapter):
version = get_volume_api_from_url(self.get_endpoint()) version = get_volume_api_from_url(self.get_endpoint())
except exceptions.UnsupportedVersion as e: except exceptions.UnsupportedVersion as e:
msg = (_("Service catalog returned invalid url.\n" msg = (_("Service catalog returned invalid url.\n"
"%s") % six.text_type(e.message)) "%s") % six.text_type(e))
raise exceptions.UnsupportedVersion(msg) raise exceptions.UnsupportedVersion(msg)
return version return version
@@ -468,10 +468,10 @@ class HTTPClient(object):
if self.management_url == self.bypass_url: if self.management_url == self.bypass_url:
msg = (_("Invalid url was specified in --os-endpoint or " msg = (_("Invalid url was specified in --os-endpoint or "
"environment variable CINDERCLIENT_BYPASS_URL.\n" "environment variable CINDERCLIENT_BYPASS_URL.\n"
"%s") % six.text_type(e.message)) "%s") % six.text_type(e))
else: else:
msg = (_("Service catalog returned invalid url.\n" msg = (_("Service catalog returned invalid url.\n"
"%s") % six.text_type(e.message)) "%s") % six.text_type(e))
raise exceptions.UnsupportedVersion(msg) raise exceptions.UnsupportedVersion(msg)