From 0b3dd7be3d3cd9842616a16843d03e6c13cdcb08 Mon Sep 17 00:00:00 2001
From: Ethan Lynn <xjunlin@cn.ibm.com>
Date: Wed, 22 Apr 2015 13:46:11 +0800
Subject: [PATCH] Fix unicodeerror when heat-engine start

If change local language to other languages(like ja), heat-engine
will failed to start.

Closes-Bug: #1446958
Change-Id: Ia3cbcebb86257bc1c52ea758c1583191e5a52a2d
---
 heat/engine/environment.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/heat/engine/environment.py b/heat/engine/environment.py
index 4b7640bf58..ab53f2bf08 100644
--- a/heat/engine/environment.py
+++ b/heat/engine/environment.py
@@ -21,6 +21,7 @@ import warnings
 
 from oslo_config import cfg
 from oslo_log import log
+from oslo_utils import encodeutils
 import six
 
 from heat.common import environment_format as env_fmt
@@ -258,7 +259,8 @@ class ResourceRegistry(object):
 
         if isinstance(info, ClassResourceInfo):
             if info.value.support_status.status != support.SUPPORTED:
-                warnings.warn(six.text_type(info.value.support_status.message))
+                warnings.warn(encodeutils.safe_encode(
+                    info.value.support_status.message))
 
         info.user_resource = (self.global_registry is not None)
         registry[name] = info