From f83108d85874a87e47b51af3eebc9faeeb11faa0 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 19 Jul 2021 11:44:28 +0900 Subject: [PATCH] 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 --- neutronclient/tests/functional/core/test_cli_formatter.py | 2 +- neutronclient/tests/unit/test_cli20.py | 6 +++--- 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 cd133dee1..145ed6c67 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 c2143e168..a067ee893 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])