Merge "Replace e.message with str(e)"

This commit is contained in:
Jenkins 2017-07-25 07:21:30 +00:00 committed by Gerrit Code Review
commit 7166052179
2 changed files with 2 additions and 7 deletions

View File

@ -125,14 +125,9 @@ class OpenStackAction(actions.Action):
# where the issue comes from.
LOG.warning(traceback.format_exc())
if hasattr(e, 'message'):
e_str = '%s: %s' % (type(e), e.message)
else:
e_str = str(e)
raise exc.ActionException(
"%s.%s failed: %s" %
(self.__class__.__name__, self.client_method_name, e_str)
(self.__class__.__name__, self.client_method_name, str(e))
)
def test(self, context):

View File

@ -185,5 +185,5 @@ class TaskPolicy(object):
raise exc.InvalidModelException(
"Invalid data type in %s: %s. Value(s) can be shown after "
"YAQL evaluating. If you use YAQL here, please correct it."
% (self.__class__.__name__, e.message)
% (self.__class__.__name__, str(e))
)