Merge lp:~barryprice/juju-deployer/resolve-yaml-warnings into lp:juju-deployer

[Barry Price]

Fix yaml.load() deprecation warnings by using SafeLoader, e.g.:

/home/barryprice/juju-deployer/deployer/tests/test_config.py:102: YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Benjamin Allot (ballot)]

LGTM.

Using safe_load lose the C binding optimization but is easier to read and maintain.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 219

=== modified file 'deployer/tests/test_config.py'
--- deployer/tests/test_config.py	2016-05-07 23:48:30 +0000
+++ deployer/tests/test_config.py	2020-10-07 11:37:47 +0000
@@ -3,6 +3,13 @@
 import mock
 import os
 import tempfile
+
+try:
+    from yaml import CSafeLoader, CSafeDumper
+    SafeLoader, SafeDumper = CSafeLoader, CSafeDumper
+except ImportError:
+    from yaml import SafeLoader
+
 import yaml
 
 import six
@@ -98,8 +105,10 @@
         # openstack.cfg
         #  includes -> ubuntu_base.cfg includes
         #               includes -> openstack_base.cfg
-        test_conf = yaml.load(open(
-            os.path.join(self.test_data_dir, "openstack", "openstack.cfg")))
+        test_conf = yaml.load(
+            open(os.path.join(self.test_data_dir, "openstack", "openstack.cfg")),
+            Loader=SafeLoader
+        )
         includes = [
             os.path.join(self.test_data_dir, "openstack", "ubuntu_base.cfg"),
             os.path.join(self.test_data_dir, "openstack", "openstack_base.cfg")

=== modified file 'deployer/tests/test_diff.py'
--- deployer/tests/test_diff.py	2016-12-20 15:10:01 +0000
+++ deployer/tests/test_diff.py	2020-10-07 11:37:47 +0000
@@ -5,6 +5,13 @@
 import shutil
 import tempfile
 import unittest
+
+try:
+    from yaml import CSafeLoader, CSafeDumper
+    SafeLoader, SafeDumper = CSafeLoader, CSafeDumper
+except ImportError:
+    from yaml import SafeLoader
+
 import yaml
 
 from mock import patch, mock_open
@@ -143,7 +150,7 @@
         edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
         dpl.save(edited_config_file)
         # in memory edit yaml content
-        edited_config = yaml.load(open(edited_config_file))
+        edited_config = yaml.load(open(edited_config_file), Loader=SafeLoader)
         edited_config["relations"].remove(
             ['nova-compute:amqp', 'rabbitmq-server:amqp'])
         edited_config = yaml.dump({'openstack': edited_config})
@@ -168,7 +175,7 @@
         edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
         dpl.save(edited_config_file)
         # in memory edit yaml content
-        edited_config = yaml.load(open(edited_config_file))
+        edited_config = yaml.load(open(edited_config_file), Loader=SafeLoader)
         edited_config["relations"].remove(
             ['ceilometer:identity-service', 'keystone:identity-service'])
         edited_config = yaml.dump({'openstack': edited_config})
@@ -193,7 +200,7 @@
         edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
         dpl.save(edited_config_file)
         # in memory edit yaml content
-        edited_config = yaml.load(open(edited_config_file))
+        edited_config = yaml.load(open(edited_config_file), Loader=SafeLoader)
         # remove ':name' from service endpoint specification
         for relation in edited_config["relations"]:
             relation = [(relation[0] + ":").split(":")[0],