From 6bf36b3b459b7a2db69ff3f845b73843086bee5d Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 16 Mar 2020 15:05:44 -0500 Subject: [PATCH] Correct YAML load warning The use of `yaml.load` is deprecated and considered unsafe. The warning notice: > /usr/lib/python3.6/site-packages/tripleoclient/utils.py:2349: 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 removes the use of the deprecated function, which corrects the issue. Change-Id: I7b747fd124880f55a30f75e5efb27c22c57ac10c Signed-off-by: Kevin Carter (cherry picked from commit 7cfe4d4f12917ef442da81e148aca96f627050f2) --- tripleoclient/export.py | 2 +- .../tests/v1/overcloud_update/test_overcloud_update.py | 4 ++-- .../tests/v1/overcloud_upgrade/test_overcloud_upgrade.py | 4 ++-- tripleoclient/utils.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tripleoclient/export.py b/tripleoclient/export.py index 181e9a2e7..41d095eb3 100644 --- a/tripleoclient/export.py +++ b/tripleoclient/export.py @@ -41,7 +41,7 @@ def export_passwords(swift, stack, excludes=True): "file from swift: %s", str(e)) sys.exit(1) - data = yaml.load(content)["passwords"] + data = yaml.safe_load(content)["passwords"] if excludes: excluded_passwords = [] for k in data: diff --git a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py index 06cfa0826..9154fe83a 100644 --- a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py +++ b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py @@ -48,7 +48,7 @@ class TestOvercloudUpdatePrepare(fakes.TestOvercloudUpdatePrepare): @mock.patch('tripleoclient.workflows.package_update.update', autospec=True) @mock.patch('os.path.abspath') - @mock.patch('yaml.load') + @mock.patch('yaml.safe_load') @mock.patch('shutil.copytree', autospec=True) @mock.patch('six.moves.builtins.open') @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' @@ -88,7 +88,7 @@ class TestOvercloudUpdatePrepare(fakes.TestOvercloudUpdatePrepare): autospec=True) @mock.patch('six.moves.builtins.open') @mock.patch('os.path.abspath') - @mock.patch('yaml.load') + @mock.patch('yaml.safe_load') @mock.patch('shutil.copytree', autospec=True) @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.' '_deploy_tripleo_heat_templates', autospec=True) diff --git a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py index 451ff9158..be54b2ca5 100644 --- a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py +++ b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py @@ -50,7 +50,7 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare): autospec=True) @mock.patch('tripleoclient.v1.overcloud_upgrade.UpgradePrepare.log', autospec=True) - @mock.patch('yaml.load') + @mock.patch('yaml.safe_load') @mock.patch('six.moves.builtins.open') def test_upgrade_out(self, mock_open, @@ -103,7 +103,7 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare): autospec=True) @mock.patch('tripleoclient.utils.prepend_environment', autospec=True) @mock.patch('six.moves.builtins.open') - @mock.patch('yaml.load') + @mock.patch('yaml.safe_load') def test_upgrade_failed(self, mock_yaml, mock_open, add_env, mock_get_stack, mock_overcloud_deploy, mock_confirm): diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py index fe72e0d16..be6cad66f 100644 --- a/tripleoclient/utils.py +++ b/tripleoclient/utils.py @@ -2134,7 +2134,7 @@ def check_file_for_enabled_service(env_file): """ if os.path.exists(env_file): with open(env_file, "r") as f: - content = yaml.load(f) + content = yaml.safe_load(f) deprecated_services_enabled = [] for service in constants.DEPRECATED_SERVICES.keys(): try: