openstack
/
ec2-api
Code Issues Proposed changes

py34: fix exception formatting to user-friendly message 

ex.args in python3 is a tuple of all arguments that was passed to exception init

Change-Id: I32c16965e3f0a62371c3a99811d34f697c5a3246
This commit is contained in:
Andrey Pavlov 2015-09-10 20:17:02 +03:00
parent 0cc5c2b70e
commit d9a300b006
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ec2api/api/__init__.py
View File

@ -368,11 +368,11 @@ def ec2_error_ex(ex, req, unexpected=False):
if unexpected and status >= 500:
message = _('Unknown error occurred.')
elif getattr(ex, 'message', None):
message = unicode(ex.message)
message = six.text_type(ex.message)
elif ex.args and any(arg for arg in ex.args):
message = " ".join(map(unicode, ex.args))
message = " ".join(map(six.text_type, ex.args))
else:
message = unicode(ex)
message = six.text_type(ex)
if unexpected:
# Log filtered environment for unexpected errors.
env = req.environ.copy()