diff options
| author | John Tran <jtran@attinteractive.com> | 2011-05-02 18:04:29 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-05-02 18:04:29 +0000 |
| commit | 42c8e73994c7d787aef0e2d97ea162ee5a2e1304 (patch) | |
| tree | d6bacfaf33137aedf4dbc4d5b91221f8af138a11 /nova/exception.py | |
| parent | 585a1819f365018a4536bf7364722965ba994845 (diff) | |
| parent | c3ab4f023e2636e254f940e08da0aded42c0e96b (diff) | |
| download | nova-42c8e73994c7d787aef0e2d97ea162ee5a2e1304.tar.gz nova-42c8e73994c7d787aef0e2d97ea162ee5a2e1304.tar.xz nova-42c8e73994c7d787aef0e2d97ea162ee5a2e1304.zip | |
ApiError 'code' arg set to None, and will only display a 'code' as part of the str if specified.
Diffstat (limited to 'nova/exception.py')
| -rw-r--r-- | nova/exception.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/exception.py b/nova/exception.py index e8444cb14..8cdd0cb5a 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -49,10 +49,14 @@ class Error(Exception): class ApiError(Error): - def __init__(self, message='Unknown', code='ApiError'): + def __init__(self, message='Unknown', code=None): self.message = message self.code = code - super(ApiError, self).__init__('%s: %s' % (code, message)) + if code: + outstr = '%s: %s' % (code, message) + else: + outstr = '%s' % message + super(ApiError, self).__init__(outstr) class DBError(Error): |