diff options
| author | Ethan Lynn <xjunlin@cn.ibm.com> | 2015-04-22 13:46:11 +0800 |
|---|---|---|
| committer | Angus Salkeld <asalkeld@mirantis.com> | 2015-04-23 03:57:18 +0000 |
| commit | c958ecb5b4b4fc5a0236b70c21d7d62864cd162b (patch) | |
| tree | 0130bed1562bda92d7f840f94323ed6d72e03bbe | |
| parent | d07f91615a159663261091e672ce62f90e6ad607 (diff) | |
| download | heat-c958ecb5b4b4fc5a0236b70c21d7d62864cd162b.tar.gz | |
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
(cherry picked from commit 0b3dd7be3d3cd9842616a16843d03e6c13cdcb08)
| -rw-r--r-- | heat/engine/environment.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/heat/engine/environment.py b/heat/engine/environment.py index 4b7640bf5..ab53f2bf0 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 |