exception.py (zun-6.0.0) | : | exception.py (zun-7.0.0) | ||
---|---|---|---|---|
skipping to change at line 214 | skipping to change at line 214 | |||
except cfg.NoSuchOptError: | except cfg.NoSuchOptError: | |||
ferr = CONF.oslo_versionedobjects.fatal_exception_format_errors | ferr = CONF.oslo_versionedobjects.fatal_exception_format_errors | |||
if ferr: | if ferr: | |||
raise | raise | |||
super(ZunException, self).__init__(self.message) | super(ZunException, self).__init__(self.message) | |||
def __str__(self): | def __str__(self): | |||
return self.message | return self.message | |||
def __unicode__(self): | ||||
return self.message | ||||
def format_message(self): | def format_message(self): | |||
if self.__class__.__name__.endswith('_Remote'): | if self.__class__.__name__.endswith('_Remote'): | |||
return self.args[0] | return self.args[0] | |||
else: | else: | |||
return str(self) | return str(self) | |||
class ObjectNotFound(ZunException): | class ObjectNotFound(ZunException): | |||
message = _("The %(name)s %(id)s could not be found.") | message = _("The %(name)s %(id)s could not be found.") | |||
class ObjectNotUnique(ZunException): | class ObjectNotUnique(ZunException): | |||
End of changes. 1 change blocks. | ||||
3 lines changed or deleted | 0 lines changed or added |