openstack/python-neutronclient
Code Issues Proposed changes

Use yaml.safe_load instead of yaml.load

Browse Source 
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
This commit is contained in:
Takashi Kajinami
2021-07-19 11:44:28 +09:00
parent adf21f0288
commit f83108d858
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutronclient/tests/functional/core/test_cli_formatter.py
View File

@@ -43,7 +43,7 @@ class TestCLIFormatter(base.ClientTestBase):
result = self._create_net('yaml', ['name', 'admin_state_up']) result = self._create_net('yaml', ['name', 'admin_state_up'])
self.assertDictEqual({'name': self.net_name, self.assertDictEqual({'name': self.net_name,
'admin_state_up': True}, 'admin_state_up': True},
yaml.load(result)) yaml.safe_load(result))
def test_net_create_with_value_formatter(self): def test_net_create_with_value_formatter(self):
# NOTE(amotoki): In 'value' formatter, there is no guarantee # NOTE(amotoki): In 'value' formatter, there is no guarantee

6
neutronclient/tests/unit/test_cli20.py
View File

@@ -1159,7 +1159,7 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_create_resource_yaml(self): def test_create_resource_yaml(self):
self._test_create_resource_with_formatter('yaml') 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('myname', data['name'])
self.assertEqual('myid', data['id']) self.assertEqual('myid', data['id'])
@@ -1184,7 +1184,7 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_show_resource_yaml(self): def test_show_resource_yaml(self):
self._test_show_resource_with_formatter('yaml') 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('myname', data['name'])
self.assertEqual('myid', data['id']) self.assertEqual('myid', data['id'])
@@ -1211,5 +1211,5 @@ class CLITestV20OutputFormatter(CLITestV20Base):
def test_list_resources_yaml(self): def test_list_resources_yaml(self):
self._test_list_resources_with_formatter('yaml') 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]) self.assertEqual(['myid1', 'myid2'], [d['id'] for d in data])