From 1a18e91083fdd58ea528513fdf85db678deeb0c7 Mon Sep 17 00:00:00 2001 From: Yang Xu Date: Sun, 5 May 2019 22:59:57 -0400 Subject: Check unicode for string Change-Id: I2d647a82fa38b1ef9ee5b8a2d80296f069e2f079 Issue-ID: INT-1064 Signed-off-by: Yang Xu --- robotframework-onap/eteutils/HEATUtils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'robotframework-onap/eteutils/HEATUtils.py') diff --git a/robotframework-onap/eteutils/HEATUtils.py b/robotframework-onap/eteutils/HEATUtils.py index 93d556a..69c026e 100644 --- a/robotframework-onap/eteutils/HEATUtils.py +++ b/robotframework-onap/eteutils/HEATUtils.py @@ -12,7 +12,7 @@ class HEATUtils: def get_yaml(self, template_file): """Template Yaml To Json reads a YAML Heat template file returns a JSON string that can be used included in an Openstack Add Stack Request""" - if isinstance(template_file, str): + if isinstance(template_file, str) or isinstance(template_file, unicode): fin = open(template_file, 'r') yamlobj = yaml.load(fin) return yamlobj @@ -20,7 +20,8 @@ class HEATUtils: def template_yaml_to_json(self, template_file): """Template Yaml To Json reads a YAML Heat template file returns a JSON string that can be used included in an Openstack Add Stack Request""" - if isinstance(template_file, str): + contents = None + if isinstance(template_file, str) or isinstance(template_file, unicode): fin = open(template_file, 'r') yamlobj = yaml.load(fin) fin.close() @@ -35,7 +36,7 @@ class HEATUtils: def env_yaml_to_json(self, template_file): """Env Yaml To JSon reads a YAML Heat env file and returns a JSON string that can be used included in an Openstack Add Stack Request""" - if isinstance(template_file, str): + if isinstance(template_file, str) or isinstance(template_file, unicode): fin = open(template_file, 'r') yamlobj = yaml.load(fin) fin.close() -- cgit 1.2.3-korg