diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-03-28 12:13:20 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-03-28 12:13:20 -0500 |
| commit | 7eedf3f69ca1bbd1f44252fa01fb4f2676735eb2 (patch) | |
| tree | 33c3983537da1d894caa6b390b5c488511df83c4 /nova/exception.py | |
| parent | 57890776d0d7e9172b1fa056076ce28ae4b34b7b (diff) | |
| parent | ed12a2cd2beef77d1c7e9d16771e766aa068530d (diff) | |
| download | nova-7eedf3f69ca1bbd1f44252fa01fb4f2676735eb2.tar.gz nova-7eedf3f69ca1bbd1f44252fa01fb4f2676735eb2.tar.xz nova-7eedf3f69ca1bbd1f44252fa01fb4f2676735eb2.zip | |
merge with trunk
Diffstat (limited to 'nova/exception.py')
| -rw-r--r-- | nova/exception.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/exception.py b/nova/exception.py index 95580ebea..66a7409ea 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -46,7 +46,7 @@ class Error(Exception): class ApiError(Error): - def __init__(self, message='Unknown', code='Unknown'): + def __init__(self, message='Unknown', code='ApiError'): self.message = message self.code = code super(ApiError, self).__init__('%s: %s' % (code, message)) @@ -88,6 +88,10 @@ class InvalidInputException(Error): pass +class InvalidContentType(Error): + pass + + class TimeoutException(Error): pass |