Resolve conflicts and merge trunk

1 files changed, 8 insertions, 0 deletions

diff --git a/nova/exception.py b/nova/exception.py
index 52497a19e..29bcb17f8 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -25,31 +25,39 @@ import logging
 import sys
 import traceback
 
+
 class Error(Exception):
     def __init__(self, message=None):
         super(Error, self).__init__(message)
 
+
 class ApiError(Error):
     def __init__(self, message='Unknown', code='Unknown'):
         self.message = message
         self.code = code
         super(ApiError, self).__init__('%s: %s'% (code, message))
 
+
 class NotFound(Error):
     pass
 
+
 class Duplicate(Error):
     pass
 
+
 class NotAuthorized(Error):
     pass
 
+
 class NotEmpty(Error):
     pass
 
+
 class Invalid(Error):
     pass
 
+
 def wrap_exception(f):
     def _wrap(*args, **kw):
         try: