summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kajinami <tkajinam@redhat.com>2021-07-19 11:44:28 +0900
committerTakashi Kajinami <tkajinam@redhat.com>2021-09-01 17:53:41 +0900
commitf83108d85874a87e47b51af3eebc9faeeb11faa0 (patch)
treedb0e54432ab54d06366d0f2fd47ffc466b13b94b
parentadf21f028827b8a4e32057334db4cd464c24c4d0 (diff)
downloadpython-neutronclient-f83108d85874a87e47b51af3eebc9faeeb11faa0.tar.gz
Use yaml.safe_load instead of yaml.load
Since PyYAML 5.1, yaml.load without specifying the Loader option is deprecated and shows the following warning. YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details. This change replaces usage of yaml.load by yaml.safe_load, to get rid of that warning message. Change-Id: Ibe25c4aaf3aa7226f28ec60b8a929ecc143face1
-rw-r--r--neutronclient/tests/functional/core/test_cli_formatter.py2
-rw-r--r--neutronclient/tests/unit/test_cli20.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/neutronclient/tests/functional/core/test_cli_formatter.py b/neutronclient/tests/functional/core/test_cli_formatter.py
index cd133de..145ed6c 100644
--- a/neutronclient/tests/functional/core/test_cli_formatter.py
+++ b/neutronclient/tests/functional/core/test_cli_formatter.py
@@ -43,7 +43,7 @@ class TestCLIFormatter(base.ClientTestBase):
result = self._create_net('yaml', ['name', 'admin_state_up'])
self.assertDictEqual({'name': self.net_name,
'admin_state_up': True},
- yaml.load(result))
+ yaml.safe_load(result))
def test_net_create_with_value_formatter(self):
# NOTE(amotoki): In 'value' formatter, there is no guarantee
diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py
index c2143e1..a067ee8 100644
--- a/neutronclient/tests/unit/test_cli20.py
+++ b/neutronclient/tests/unit/test_cli20.py
@@ -1159,7 +1159,7 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_create_resource_yaml(self):
self._test_create_resource_with_formatter('yaml')
- data = yaml.load(self.fake_stdout.make_string())
+ data = yaml.safe_load(self.fake_stdout.make_string())
self.assertEqual('myname', data['name'])
self.assertEqual('myid', data['id'])
@@ -1184,7 +1184,7 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_show_resource_yaml(self):
self._test_show_resource_with_formatter('yaml')
- data = yaml.load(''.join(self.fake_stdout.content))
+ data = yaml.safe_load(''.join(self.fake_stdout.content))
self.assertEqual('myname', data['name'])
self.assertEqual('myid', data['id'])
@@ -1211,5 +1211,5 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_list_resources_yaml(self):
self._test_list_resources_with_formatter('yaml')
- data = yaml.load(''.join(self.fake_stdout.content))
+ data = yaml.safe_load(''.join(self.fake_stdout.content))
self.assertEqual(['myid1', 'myid2'], [d['id'] for d in data])