openstack/nova
Code Issues Proposed changes

Accept message as sole argument to NovaException

Browse Source 
Fixes bug 860666

Python nose will sometimes recreate an exception to add captured log
information to the string representation of the exception. It assumes
that it can do this by reinstantiating the class of the originally
triggered exception with one argument, a new string description.
NovaException, and some child classes, didn't work well with this
scheme and would result in a further exception during formatting, which
would result in an unformatted string being displayed.

Change-Id: I7152cb7809fa1deb3986c127370f670fb2da342d
This commit is contained in:
Johannes Erdfelt
2011-09-28 15:01:27 +00:00
parent a2646129bc
commit 82bef282c9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/exception.py
View File

@@ -138,17 +138,17 @@ class NovaException(Exception):
"""
message = _("An unknown exception occurred.")
def __init__(self, **kwargs):
def __init__(self, message=None, **kwargs):
self.kwargs = kwargs
if not message:
try:
self._error_string = self.message % kwargs
message = self.message % kwargs
except Exception:
except Exception as e:
# at least get the core message out if something happened
self._error_string = self.message
message = self.message
def __str__(self):
return self._error_string
super(NovaException, self).__init__(message)
class ImagePaginationFailed(NovaException):
@@ -168,7 +168,7 @@ class NotAuthorized(NovaException):
message = _("Not authorized.")
def __init__(self, *args, **kwargs):
super(NotAuthorized, self).__init__(**kwargs)
super(NotAuthorized, self).__init__(*args, **kwargs)
class AdminRequired(NotAuthorized):
@@ -317,7 +317,7 @@ class NotFound(NovaException):
message = _("Resource could not be found.")
def __init__(self, *args, **kwargs):
super(NotFound, self).__init__(**kwargs)
super(NotFound, self).__init__(*args, **kwargs)
class FlagNotSet(NotFound):