ApiError code should default to None, and will only display a code if one exists. Prior was output an 'ApiError: ApiError: error message' string, which is confusing

1 files changed, 6 insertions, 2 deletions

diff --git a/nova/exception.py b/nova/exception.py
index 4e2bbdbaf..c0bc68b6c 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -46,10 +46,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 NotFound(Error):