Merge "Avoid Forcing the Translation of Translatable Variables"

This commit is contained in:
Jenkins 2016-12-21 01:48:03 +00:00 committed by Gerrit Code Review
commit 33e9e35cd1
2 changed files with 2 additions and 3 deletions

@ -511,8 +511,7 @@ class ExtensionManager(object):
LOG.debug(_('Ext namespace: %s'), extension.get_namespace())
LOG.debug(_('Ext updated: %s'), extension.get_updated())
except AttributeError as ex:
LOG.exception(_("Exception loading extension: %s"),
six.text_type(ex))
LOG.exception(_("Exception loading extension: %s"), ex)
return False
return True

@ -788,7 +788,7 @@ class Resource(Application):
try:
action_result = self.dispatch(request, action, args)
except webob.exc.HTTPException as ex:
LOG.info(_("HTTP exception thrown: %s"), six.text_type(ex))
LOG.info(_("HTTP exception thrown: %s"), ex)
action_result = Fault(ex,
self._fault_body_function)
except Exception: