X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fdescriptor_topics.py;fp=osm_nbi%2Fdescriptor_topics.py;h=ca10c424d3a559207685d0dba2f03486d4247a0c;hp=2814653075319bddcec773e78e8ca4ee74a6df95;hb=4cd875d2a38488b5e717258d548eeb8e557ec9a8;hpb=f2af4a100d308e07f355d61b94fb27d1ccc97aa2 diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py index 2814653..ca10c42 100644 --- a/osm_nbi/descriptor_topics.py +++ b/osm_nbi/descriptor_topics.py @@ -437,7 +437,7 @@ class DescriptorTopic(BaseTopic): indata = json.load(content) else: error_text = "Invalid yaml format " - indata = yaml.load(content, Loader=yaml.SafeLoader) + indata = yaml.safe_load(content) # Need to close the file package here so it can be copied from the # revision to the current, unrevisioned record @@ -1323,11 +1323,9 @@ class VnfdTopic(DescriptorTopic): with self.fs.file_open( (old_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as old_descriptor_file: - with self.fs.file_open( (new_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as new_descriptor_file: - old_content = yaml.safe_load(old_descriptor_file.read()) new_content = yaml.safe_load(new_descriptor_file.read()) @@ -1719,11 +1717,9 @@ class NsdTopic(DescriptorTopic): with self.fs.file_open( (old_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as old_descriptor_file: - with self.fs.file_open( (new_descriptor_directory.rstrip("/"), descriptor_file_name), "r" ) as new_descriptor_file: - old_content = yaml.safe_load(old_descriptor_file.read()) new_content = yaml.safe_load(new_descriptor_file.read())