diff --git a/nova/exception.py b/nova/exception.py index dfa20dd25..9bb39b2f4 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -76,8 +76,7 @@ class ProcessExecutionError(IOError): class Error(Exception): - def __init__(self, message=None): - super(Error, self).__init__(message) + pass class EC2APIError(Error): @@ -207,9 +206,6 @@ class MelangeConnectionFailed(NovaException): class NotAuthorized(NovaException): message = _("Not authorized.") - def __init__(self, *args, **kwargs): - super(NotAuthorized, self).__init__(*args, **kwargs) - class AdminRequired(NotAuthorized): message = _("User does not have admin privileges") @@ -406,9 +402,6 @@ class InvalidEc2Id(Invalid): class NotFound(NovaException): message = _("Resource could not be found.") - def __init__(self, *args, **kwargs): - super(NotFound, self).__init__(*args, **kwargs) - class FlagNotSet(NotFound): message = _("Required flag %(flag)s not set.") @@ -911,11 +904,8 @@ class ImageTooLarge(NovaException): message = _("Image is larger than instance type allows") -class ZoneRequestError(Error): - def __init__(self, message=None): - if message is None: - message = _("1 or more Zones could not complete the request") - super(ZoneRequestError, self).__init__(message=message) +class ZoneRequestError(NovaException): + message = _("1 or more Zones could not complete the request") class InstanceTypeMemoryTooSmall(NovaException): diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py index 9706a5d8e..68d4c29e7 100644 --- a/nova/scheduler/api.py +++ b/nova/scheduler/api.py @@ -259,7 +259,7 @@ class RedirectResult(exception.Error): def __init__(self, results): self.results = results super(RedirectResult, self).__init__( - message=_("Uncaught Zone redirection exception")) + _("Uncaught Zone redirection exception")) class reroute_compute(object):