Merge "Avoid referencing Message.__str__ in exceptions"

heat/common/exception.py

@@ -120,11 +120,14 @@ class HeatException(Exception):
                 raise exc_info[0], exc_info[1], exc_info[2]
 
     def __str__(self):
-        return str(self.message)
+        return unicode(self.message).encode('UTF-8')
 
     def __unicode__(self):
         return unicode(self.message)
 
+    def __deepcopy__(self, memo):
+        return self.__class__(**self.kwargs)
+
 
 class MissingCredentialError(HeatException):
     msg_fmt = _("Missing required credential: %(required)s")

heat/engine/constraints.py

@@ -22,7 +22,7 @@ from heat.engine import resources
 from heat.common import exception
 
 
-class InvalidSchemaError(Exception):
+class InvalidSchemaError(exception.Error):
     pass
 
 

heat/engine/resources/wait_condition.py

@@ -13,6 +13,7 @@
 
 import json
 
+from heat.common import exception
 from heat.common import identifier
 from heat.engine import constraints
 from heat.engine import properties
@@ -126,13 +127,13 @@ class UpdateWaitConditionHandle(WaitConditionHandle):
         raise resource.UpdateReplace(self.name)
 
 
-class WaitConditionFailure(Exception):
+class WaitConditionFailure(exception.Error):
     def __init__(self, wait_condition, handle):
         reasons = handle.get_status_reason(STATUS_FAILURE)
         super(WaitConditionFailure, self).__init__(reasons)
 
 
-class WaitConditionTimeout(Exception):
+class WaitConditionTimeout(exception.Error):
     def __init__(self, wait_condition, handle):
         reasons = handle.get_status_reason(STATUS_SUCCESS)
         vals = {'len': len(reasons),

heat/engine/scheduler.py

@@ -91,10 +91,11 @@ class ExceptionGroup(Exception):
         self.exceptions = list(exceptions)
 
     def __str__(self):
-        return str(map(str, self.exceptions))
+        return unicode([unicode(ex).encode('utf-8')
+                        for ex in self.exceptions]).encode('utf-8')
 
     def __unicode__(self):
-        return unicode(map(str, self.exceptions))
+        return unicode(map(unicode, self.exceptions))
 
 
 class TaskRunner(object):