Merge "Python 3: decode bytes before feeding them to jsonutils.loads()"

1 files changed, 3 insertions, 0 deletions

diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py
index 9ffee78..ae55cdb 100644
--- a/heatclient/v1/shell.py
+++ b/heatclient/v1/shell.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import logging
+import six
 from six.moves.urllib import request
 import yaml
 
@@ -663,6 +664,8 @@ def do_resource_signal(hc, args):
         data_url = template_utils.normalise_file_path_to_url(data_file)
         data = request.urlopen(data_url).read()
     if data:
+        if isinstance(data, six.binary_type):
+            data = data.decode('utf-8')
         try:
             data = jsonutils.loads(data)
         except ValueError as ex: