From d377abc6b2fb1478c832946d5dc45af774f366ce Mon Sep 17 00:00:00 2001
From: Yasufumi Ogawa <yasufum.o@gmail.com>
Date: Tue, 11 Aug 2020 04:38:39 +0000
Subject: [PATCH] Fix deprecated yaml loader usage
Using `yaml.load()` without a loader is deprecated. This update replaces
this method with `yaml.safe_load()` uses `yaml.SafeLoader`.
Change-Id: I69caca2775d43de59e10c04a7684b22d999beab6
Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
toscaparser/prereq/csar.py | 4 ++--
toscaparser/tests/test_constraints.py | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/toscaparser/prereq/csar.py b/toscaparser/prereq/csar.py
index 535b8644..e9341ab4 100644
--- a/toscaparser/prereq/csar.py
+++ b/toscaparser/prereq/csar.py
@@ -141,7 +141,7 @@ class CSAR(object):
'contain valid TOSCA YAML content.') %
{'template': main_template, 'csar': self.path})
try:
- tosca_yaml = yaml.load(data)
+ tosca_yaml = yaml.safe_load(data)
if type(tosca_yaml) is not dict:
ExceptionCollector.appendException(
ValidationError(message=invalid_tosca_yaml_err_msg))
@@ -289,7 +289,7 @@ class CSAR(object):
'contain valid YAML content.') %
{'template': template, 'csar': self.path})
try:
- tosca_yaml = yaml.load(data)
+ tosca_yaml = yaml.safe_load(data)
if type(tosca_yaml) is not dict:
ExceptionCollector.appendException(
ValidationError(message=invalid_tosca_yaml_err_msg))
diff --git a/toscaparser/tests/test_constraints.py b/toscaparser/tests/test_constraints.py
index c6fdd9d9..553c1303 100644
--- a/toscaparser/tests/test_constraints.py
+++ b/toscaparser/tests/test_constraints.py
@@ -110,7 +110,7 @@ class ConstraintTest(TestCase):
def test_invalid_in_range(self):
snippet = 'in_range: {2, 6}'
- schema = yaml.load(snippet)
+ schema = yaml.safe_load(snippet)
error = self.assertRaises(exception.InvalidSchemaError, Constraint,
'prop', Schema.INTEGER,
schema)
@@ -171,7 +171,7 @@ class ConstraintTest(TestCase):
def test_greater_than_invalid(self):
snippet = 'greater_than: {4}'
- schema = yaml.load(snippet)
+ schema = yaml.safe_load(snippet)
error = self.assertRaises(exception.InvalidSchemaError, Constraint,
'prop', Schema.INTEGER,
schema)
@@ -201,7 +201,7 @@ class ConstraintTest(TestCase):
def test_greater_or_equal_invalid(self):
snippet = 'greater_or_equal: {3.9}'
- schema = yaml.load(snippet)
+ schema = yaml.safe_load(snippet)
error = self.assertRaises(exception.InvalidSchemaError, Constraint,
'prop', Schema.INTEGER,
schema)
@@ -233,7 +233,7 @@ class ConstraintTest(TestCase):
def test_less_than_invalid(self):
snippet = 'less_than: {3.9}'
- schema = yaml.load(snippet)
+ schema = yaml.safe_load(snippet)
error = self.assertRaises(exception.InvalidSchemaError, Constraint,
'prop', Schema.INTEGER,
schema)
@@ -256,7 +256,7 @@ class ConstraintTest(TestCase):
def test_less_or_equal_invalid(self):
snippet = 'less_or_equal: {3.9}'
- schema = yaml.load(snippet)
+ schema = yaml.safe_load(snippet)
error = self.assertRaises(exception.InvalidSchemaError, Constraint,
'prop', Schema.INTEGER,
schema)