diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-02-24 11:55:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-02-24 11:55:30 +0000 |
| commit | 55ad4b715439c672c2392a0a9106e9941e08ad9f (patch) | |
| tree | 55363c180e48453111d28c2b3c9f4ca07e630bb8 /heatclient/common/template_utils.py | |
| parent | 537809a983ff43ad9908a58de06035b5a4b0f174 (diff) | |
| parent | e8651fa5c0b9615c4bec509e5e66d5ec5162c7f7 (diff) | |
| download | python-heatclient-55ad4b715439c672c2392a0a9106e9941e08ad9f.tar.gz | |
Merge "Python3: fix bytes/str issues"
Diffstat (limited to 'heatclient/common/template_utils.py')
| -rw-r--r-- | heatclient/common/template_utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py index 221c2f2..c1fced1 100644 --- a/heatclient/common/template_utils.py +++ b/heatclient/common/template_utils.py @@ -46,6 +46,8 @@ def get_template_contents(template_file=None, template_url=None, % template_url) try: + if isinstance(tpl, six.binary_type): + tpl = tpl.decode('utf-8') template = template_format.parse(tpl) except ValueError as e: raise exc.CommandError( |